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

Common - Fix adding unusable throwables (#9980)

Browse Source 
* Prevent adding unusable grenades

* Update fnc_addToInventory.sqf

* Update addons/common/functions/fnc_addToInventory.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_addToInventory.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
This commit is contained in:
johnb432 2024-04-29 19:13:47 +02:00 committed by GitHub
parent 3987c62acc
commit 4f1c2fa8d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/common/functions/fnc_addToInventory.sqf
View File

@ -59,6 +59,21 @@ switch (_container) do {
}; };
}; };
if (_type select 0 == "magazine") then {
private _configAmmoCount = getNumber (configFile >> "CfgMagazines" >> _classname >> "count");
// https://feedback.bistudio.com/T74244
// When adding throwables with the addXXXCargo(Global) commands, they don't show up in the throwables list
// If a throwable has more than 1 ammo count, adding it with addItem(XXX) commands also renders the throwable unusable
if (_configAmmoCount == 1 && {_ammoCount in [-1, 1]} && {_classname call BIS_fnc_isThrowable}) then { // TODO: replace with https://community.bistudio.com/wiki/isThrowable in 2.18
_type set [0, "item"];
};
if (_ammoCount == -1) then {
_ammoCount = _configAmmoCount;
};
};
switch (_type select 0) do { switch (_type select 0) do {
case "weapon": { case "weapon": {
if (_canAdd || {_canFitWeaponSlot}) then { if (_canAdd || {_canFitWeaponSlot}) then {
@ -106,10 +121,6 @@ switch (_type select 0) do {
}; };
case "magazine": { case "magazine": {
if (_ammoCount == -1) then {
_ammoCount = getNumber (configFile >> "CfgMagazines" >> _classname >> "count");
};
if (_canAdd) then { if (_canAdd) then {
_addedToUnit = true; _addedToUnit = true;