Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reload - Fix check ammo display for empty GL launchers (#7624)

Browse Source 
* Reload - Fix check ammo display for empty GL launchers

* Improve display for secondary muzzle
This commit is contained in:
PabstMirror 2020-04-10 15:13:55 -05:00 committed by GitHub
parent 68ef196bcf
commit c4514b3fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
addons/reload/functions/fnc_displayAmmo.sqf
View File

@ -42,7 +42,7 @@ if (_target isKindOf "StaticWeapon") then {
};
} forEach _magazines;
};
// For static weapons the muzzle seemingly never returns anything for static weapons with/without people inside
if (_muzzle == "") then {
_muzzle = _weapon;
@ -53,16 +53,32 @@ if (_magazine == "") exitWith {};
if (_weapon == "") exitWith {};
if (!( _muzzle isEqualType "")) then {_muzzle = _weapon};
private _showNumber = false;
private _ammo = 0;
private _maxRounds = 1;
private _count = 0;
private _maxRounds = getNumber (configFile >> "CfgMagazines" >> _magazine >> "count") max 1;
private _count = -1; // Show a count instead of ammo bars (ignore if -1)
// not grenade launcher
if (_muzzle == _weapon) then {
_maxRounds = getNumber (configFile >> "CfgMagazines" >> _magazine >> "count") max 1;
_ammo = _target ammo _weapon;
} else {
// grenade launcher (or some kind of seconday muzzle)
_ammo = _target ammo _muzzle;
if (_ammo > 0) then {
if (_maxRounds == 1) then { // singleShot so show count of identical mags available instead of ammo bars
_count = {_x == _magazine} count (magazines _target + [_magazine]) // add the loaded mag
};
} else {
if (_maxRounds <= 3) then { // empty GL/3GL - don't have a real magazine so just show count of any compatible mag
_magazine = "";
private _compatibleMagazines = [configFile >> "CfgWeapons" >> _weapon >> _muzzle] call CBA_fnc_compatibleMagazines;
_count = {_x in _compatibleMagazines} count (magazines _target); // safe because everything is config case
};
};
};
private _ammoBarsStructuredText = if (_count >= 0) then {
parseText format ["<t align='center' >%1x</t>", _count]
} else {
if (_maxRounds >= COUNT_BARS) then {
_count = round (COUNT_BARS * _ammo / _maxRounds);
@ -72,20 +88,6 @@ if (_muzzle == _weapon) then {
_count = _ammo;
};
// grenade launcher
} else {
_showNumber = true;
_count = if (_magazine != "") then {
{_x == _magazine} count (magazines _target + [_magazine])
} else {
{_x in getArray (configFile >> "CfgWeapons" >> _weapon >> _muzzle >> "Magazines")} count magazines _target
};
};
private _ammoBarsStructuredText = if (_showNumber) then {
parseText format ["<t align='center' >%1x</t>", _count]
} else {
private _color = [((2 * (1 - _ammo / _maxRounds)) min 1), ((2 * _ammo / _maxRounds) min 1), 0];
private _string = "";
@ -110,6 +112,10 @@ if (_target isKindOf "StaticWeapon") then {
private _text = composeText [_loadedName, linebreak, _ammoBarsStructuredText];
[_text] call EFUNC(common,displayTextStructured);
} else {
private _picture = getText (configFile >> "CfgMagazines" >> _magazine >> "picture");
[_ammoBarsStructuredText, _picture] call EFUNC(common,displayTextPicture);
if (_magazine != "") then {
private _picture = getText (configFile >> "CfgMagazines" >> _magazine >> "picture");
[_ammoBarsStructuredText, _picture] call EFUNC(common,displayTextPicture);
} else {
[_ammoBarsStructuredText, 1] call EFUNC(common,displayTextStructured);
};
};