Skip to content

Commit

Permalink
Common - Fix adding unusable throwables (#9980)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
johnb432 and LinkIsGrim authored Apr 29, 2024
1 parent 3987c62 commit 4f1c2fa
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions addons/common/functions/fnc_addToInventory.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
case "weapon": {
if (_canAdd || {_canFitWeaponSlot}) then {
Expand Down Expand Up @@ -106,10 +121,6 @@ switch (_type select 0) do {
};

case "magazine": {
if (_ammoCount == -1) then {
_ammoCount = getNumber (configFile >> "CfgMagazines" >> _classname >> "count");
};

if (_canAdd) then {
_addedToUnit = true;

Expand Down

0 comments on commit 4f1c2fa

Please sign in to comment.