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

Dogtags - Drop dog tag on ground if unit doesn't have inventory space #10094

Merged
merged 2 commits into from
Jul 2, 2024
Merged

Dogtags - Drop dog tag on ground if unit doesn't have inventory space #10094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b864cde
Drop dogtag on ground if unit doesn't have inventory space
johnb432 Jun 29, 2024
09c4581
Only allow taking of dogtags if unit has space
johnb432 Jul 1, 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
3 changes: 2 additions & 1 deletion addons/dogtags/functions/fnc_addDogtagItem.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ params ["_item", "_dogtagData"];

if (_item == "") exitWith {};

[ace_player, _item] call CBA_fnc_addItem;
// Verify that the unit has inventory space, otherwise drop the dogtag on the ground
[ace_player, _item, true] call CBA_fnc_addItem;

_dogtagData params ["_nickName"];
private _displayText = format [localize LSTRING(takeDogtagSuccess), _nickName];
Expand Down
2 changes: 1 addition & 1 deletion addons/dogtags/functions/fnc_canTakeDogtag.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ if (isNull _target) exitWith {false};
// check if disabled for faction
if ((faction _target) in GVAR(disabledFactions)) exitWith {false};

(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}
((!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}) && {_player canAdd ["ACE_dogtag", 1/*, true*/]} // Todo: Uncomment in 2.18
Loading