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 replaceRegisteredItems if replacing item with nothing (#9552)

Browse Source
This commit is contained in:
PabstMirror 2023-10-23 12:20:23 -05:00 committed by GitHub
parent 9160826faa
commit 5bf46245b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
addons/common/functions/fnc_replaceRegisteredItems.sqf
View File

@ -33,37 +33,50 @@ if (GVAR(blockItemReplacement)) exitWith {
};
private _cfgWeapons = configFile >> "CfgWeapons"; // Microoptimization
private _containerItems = [uniformItems _unit, vestItems _unit, backpackItems _unit];
for "_i" from 0 to count _newItems - 1 do {
private _item = _newItems#_i;
// Get count of item in each container
private _containerCount = [];
{
_containerCount pushBack ({_x == _item} count _x)
} forEach [uniformItems _unit, vestItems _unit, backpackItems _unit];
private _doReplace = false;
private _replacements = [];
// Determine replacement items: direct replacements, ...
private _replacements = GVAR(itemReplacements) getVariable [_item, []];
private _directReplacements = GVAR(itemReplacements) getVariable _item;
if (!isNil "_directReplacements") then {
_doReplace = true;
_replacements append _directReplacements;
};
// ... item type replacements ...
private _type = getNumber (_cfgWeapons >> _item >> "ItemInfo" >> "type");
private _typeReplacements = GVAR(itemReplacements) getVariable ["$" + str _type, []];
_replacements append _typeReplacements;
private _typeReplacements = GVAR(itemReplacements) getVariable ("$" + str _type);
if (!isNil "_typeReplacements") then {
_doReplace = true;
_replacements append _typeReplacements;
};
// ... and inherited replacements
{
if (_item isKindOf [_x, _cfgWeapons]) then {
private _inheritedReplacements = GVAR(itemReplacements) getVariable [_x, []];
_replacements append _inheritedReplacements;
private _inheritedReplacements = GVAR(itemReplacements) getVariable _x;
if (!isNil "_inheritedReplacements") then {
_doReplace = true;
_replacements append _inheritedReplacements;
};
};
} forEach GVAR(inheritedReplacements);
// Replace all items of current class in list
if (_replacements isNotEqualTo []) then {
TRACE_3("replace",_item,_count,_replacements);
if (_doReplace) then {
TRACE_2("replace",_item,_replacements);
_unit removeItems _item;
if (_replacements isEqualTo []) exitWith {};
// Get count of item in each container
private _containerCount = _containerItems apply {{_x == _item} count _x};
TRACE_1("",_containerCount);
{
if (_x == 0) then {continue};
private _container = ["uniform", "vest", "backpack"] select _forEachIndex;