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

Arsenal - Use canAdd to check if item can be added to container (#9699)

Browse Source 
* switch to canAdd instead of mass check

* cache lookup begone

* mass begone

* compile cache

* remove itemInfo check
This commit is contained in:
Grim 2023-12-31 09:01:04 -03:00 committed by GitHub
parent c3f442ffa7
commit 106c09495f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
addons/arsenal/functions/fnc_fillRightPanel.sqf
View File

@ -47,7 +47,7 @@ private _rightPanelCache = uiNamespace getVariable QGVAR(rightPanelCache);
private _currentCargo = itemsWithMagazines GVAR(center); private _currentCargo = itemsWithMagazines GVAR(center);
private _fnc_fillRightContainer = { private _fnc_fillRightContainer = {
params ["_configCategory", "_className", "_hasItemInfo", ["_isUnique", false, [false]], ["_unknownOrigin", false, [false]]]; params ["_configCategory", "_className", ["_isUnique", false, [false]], ["_unknownOrigin", false, [false]]];
if (GVAR(favoritesOnly) && {!(_className in _currentCargo)} && {!((toLower _className) in GVAR(favorites))}) exitWith {}; if (GVAR(favoritesOnly) && {!(_className in _currentCargo)} && {!((toLower _className) in GVAR(favorites))}) exitWith {};
@ -64,7 +64,6 @@ private _fnc_fillRightContainer = {
// "Misc. items" magazines (e.g. spare barrels, intel, photos) // "Misc. items" magazines (e.g. spare barrels, intel, photos)
if (_className in (uiNamespace getVariable QGVAR(magazineMiscItems))) then { if (_className in (uiNamespace getVariable QGVAR(magazineMiscItems))) then {
_configPath = _cfgMagazines >> _className; _configPath = _cfgMagazines >> _className;
_hasItemInfo = false;
}; };
// If an item with unknown origin is in the arsenal list, try to find it // If an item with unknown origin is in the arsenal list, try to find it
@ -75,34 +74,15 @@ private _fnc_fillRightContainer = {
if (isNull _configPath) then { if (isNull _configPath) then {
_configPath = _className call CBA_fnc_getObjectConfig; _configPath = _className call CBA_fnc_getObjectConfig;
}; };
// Check if item is has item info
_itemInfo = isClass (_cfgWeapons >> configName _configPath);
}; };
// Get mass [getText (_configPath >> "displayName"), getText (_configPath >> "picture")]
private _mass = if (!_hasItemInfo) then { }, true]) params ["_displayName", "_picture"];
getNumber (_configPath >> "mass")
} else {
private _mass = getNumber (_configPath >> "itemInfo" >> "mass");
if (_mass == 0) then {
_mass = getNumber (_configPath >> "WeaponSlotsInfo" >> "mass");
};
_mass
};
_rightPanelCache set [_className, _mass]; // Needed because this provides more accurate weight for FUNC(updateRightPanel)
[getText (_configPath >> "displayName"), getText (_configPath >> "picture"), _mass]
}, true]) params ["_displayName", "_picture", "_mass"];
private _lbAdd = _ctrlPanel lnbAddRow ["", _displayName, "0"]; private _lbAdd = _ctrlPanel lnbAddRow ["", _displayName, "0"];
_ctrlPanel lnbSetText [[_lbAdd, 1], _displayName]; _ctrlPanel lnbSetText [[_lbAdd, 1], _displayName];
_ctrlPanel lnbSetData [[_lbAdd, 0], _className]; _ctrlPanel lnbSetData [[_lbAdd, 0], _className];
_ctrlPanel lnbSetPicture [[_lbAdd, 0], _picture]; _ctrlPanel lnbSetPicture [[_lbAdd, 0], _picture];
_ctrlPanel lnbSetValue [[_lbAdd, 0], _mass];
_ctrlPanel lnbSetValue [[_lbAdd, 2], [0, 1] select _isUnique]; _ctrlPanel lnbSetValue [[_lbAdd, 2], [0, 1] select _isUnique];
_ctrlPanel lnbSetTooltip [[_lbAdd, 0], format ["%1\n%2", _displayName, _className]]; _ctrlPanel lnbSetTooltip [[_lbAdd, 0], format ["%1\n%2", _displayName, _className]];
if ((toLower _className) in GVAR(favorites)) then { if ((toLower _className) in GVAR(favorites)) then {
@ -230,11 +210,11 @@ switch (_ctrlIDC) do {
} forEach _compatibleItems; } forEach _compatibleItems;
} else { } else {
{ {
["CfgWeapons", _x, true] call _fnc_fillRightContainer; ["CfgWeapons", _x] call _fnc_fillRightContainer;
} forEach (keys ((GVAR(virtualItems) get IDX_VIRT_ATTACHMENTS) get _index)); } forEach (keys ((GVAR(virtualItems) get IDX_VIRT_ATTACHMENTS) get _index));
{ {
["CfgWeapons", _x, true, true] call _fnc_fillRightContainer; ["CfgWeapons", _x, true] call _fnc_fillRightContainer;
} forEach (keys ((GVAR(virtualItems) get IDX_VIRT_UNIQUE_ATTACHMENTS) get _index)); } forEach (keys ((GVAR(virtualItems) get IDX_VIRT_UNIQUE_ATTACHMENTS) get _index));
}; };
}; };
@ -253,44 +233,44 @@ switch (_ctrlIDC) do {
case IDC_buttonMag: { case IDC_buttonMag: {
{ {
if (_x in (GVAR(virtualItems) get IDX_VIRT_ITEMS_ALL)) then { if (_x in (GVAR(virtualItems) get IDX_VIRT_ITEMS_ALL)) then {
["CfgMagazines", _x, false] call _fnc_fillRightContainer; ["CfgMagazines", _x] call _fnc_fillRightContainer;
continue; continue;
}; };
if (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_VIRT_ITEMS_ALL)) then { if (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_VIRT_ITEMS_ALL)) then {
["CfgMagazines", _x, false, true] call _fnc_fillRightContainer; ["CfgMagazines", _x, true] call _fnc_fillRightContainer;
}; };
} forEach (keys _compatibleMagsAll); } forEach (keys _compatibleMagsAll);
}; };
// All magazines // All magazines
case IDC_buttonMagALL: { case IDC_buttonMagALL: {
{ {
["CfgMagazines", _x, false] call _fnc_fillRightContainer; ["CfgMagazines", _x] call _fnc_fillRightContainer;
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_ITEMS_ALL)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_ITEMS_ALL));
{ {
["CfgMagazines", _x, false, true] call _fnc_fillRightContainer; ["CfgMagazines", _x, true] call _fnc_fillRightContainer;
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_VIRT_ITEMS_ALL)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_VIRT_ITEMS_ALL));
}; };
// Grenades // Grenades
case IDC_buttonThrow: { case IDC_buttonThrow: {
{ {
["CfgMagazines", _x, false] call _fnc_fillRightContainer; ["CfgMagazines", _x] call _fnc_fillRightContainer;
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_GRENADES)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_GRENADES));
{ {
["CfgMagazines", _x, false, true] call _fnc_fillRightContainer; ["CfgMagazines", _x, true] call _fnc_fillRightContainer;
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_GRENADES)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_GRENADES));
}; };
// Explosives // Explosives
case IDC_buttonPut: { case IDC_buttonPut: {
{ {
["CfgMagazines", _x, false] call _fnc_fillRightContainer; ["CfgMagazines", _x] call _fnc_fillRightContainer;
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_EXPLOSIVES)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_EXPLOSIVES));
{ {
["CfgMagazines", _x, false, true] call _fnc_fillRightContainer; ["CfgMagazines", _x, true] call _fnc_fillRightContainer;
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_EXPLOSIVES)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_EXPLOSIVES));
}; };
// Misc. items // Misc. items
@ -309,31 +289,31 @@ switch (_ctrlIDC) do {
// "Regular" misc. items // "Regular" misc. items
{ {
if !(_x in _items) then { if !(_x in _items) then {
["CfgWeapons", _x, true] call _fnc_fillRightContainer; ["CfgWeapons", _x] call _fnc_fillRightContainer;
}; };
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_MISC_ITEMS)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_MISC_ITEMS));
// Unique items // Unique items
{ {
if !(_x in _items) then { if !(_x in _items) then {
["CfgWeapons", _x, true, true] call _fnc_fillRightContainer; ["CfgWeapons", _x, true] call _fnc_fillRightContainer;
}; };
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_MISC_ITEMS)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_MISC_ITEMS));
// Unique backpacks // Unique backpacks
{ {
if !(_x in _items) then { if !(_x in _items) then {
["CfgVehicles", _x, false, true] call _fnc_fillRightContainer; ["CfgVehicles", _x, true] call _fnc_fillRightContainer;
}; };
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_BACKPACKS)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_BACKPACKS));
// Unique goggles // Unique goggles
{ {
if !(_x in _items) then { if !(_x in _items) then {
["CfgGlasses", _x, false, true] call _fnc_fillRightContainer; ["CfgGlasses", _x, true] call _fnc_fillRightContainer;
}; };
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_GOGGLES)); } forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_GOGGLES));
// Unknown items // Unknown items
{ {
if !(_x in _items) then { if !(_x in _items) then {
["CfgWeapons", _x, true, !(_x in GVAR(virtualItemsFlat)), true] call _fnc_fillRightContainer; ["CfgWeapons", _x, !(_x in GVAR(virtualItemsFlat)), true] call _fnc_fillRightContainer;
}; };
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_UNKNOWN_ITEMS)); // if an item is here but in virtual items, it's just in the wrong place } forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_UNKNOWN_ITEMS)); // if an item is here but in virtual items, it's just in the wrong place
}; };
@ -347,23 +327,23 @@ switch (_ctrlIDC) do {
switch (true) do { switch (true) do {
// "Regular" misc. items // "Regular" misc. items
case (_x in (GVAR(virtualItems) get IDX_VIRT_MISC_ITEMS)): { case (_x in (GVAR(virtualItems) get IDX_VIRT_MISC_ITEMS)): {
["CfgWeapons", _x, true] call _fnc_fillRightContainer; ["CfgWeapons", _x] call _fnc_fillRightContainer;
}; };
// Unique items // Unique items
case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_MISC_ITEMS)): { case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_MISC_ITEMS)): {
["CfgWeapons", _x, true, true] call _fnc_fillRightContainer; ["CfgWeapons", _x, true] call _fnc_fillRightContainer;
}; };
// Unique backpacks // Unique backpacks
case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_BACKPACKS)): { case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_BACKPACKS)): {
["CfgVehicles", _x, false, true] call _fnc_fillRightContainer; ["CfgVehicles", _x, true] call _fnc_fillRightContainer;
}; };
// Unique goggles // Unique goggles
case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_GOGGLES)): { case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_GOGGLES)): {
["CfgGlasses", _x, false, true] call _fnc_fillRightContainer; ["CfgGlasses", _x, true] call _fnc_fillRightContainer;
}; };
// Unknown items // Unknown items
case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_UNKNOWN_ITEMS)): { case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_UNKNOWN_ITEMS)): {
["CfgWeapons", _x, true, !(_x in GVAR(virtualItemsFlat)), true] call _fnc_fillRightContainer; ["CfgWeapons", _x, !(_x in GVAR(virtualItemsFlat)), true] call _fnc_fillRightContainer;
}; };
}; };
} forEach _items; } forEach _items;

9
addons/arsenal/functions/fnc_updateRightPanel.sqf
View File

@ -18,19 +18,18 @@
params ["_control", "_container", "_hasItems"]; params ["_control", "_container", "_hasItems"];
private _loadRemaining = maxLoad _container - loadAbs _container; private _loadRemaining = maxLoad _container - loadAbs _container;
private _rightPanelCache = uiNamespace getVariable [QGVAR(rightPanelCache), createHashMap];
private _mass = -1; private _item = "";
private _color = []; private _color = [];
private _alpha = 1; private _alpha = 1;
// Grey out items that are too big to fit in remaining space of the container // Grey out items that are too big to fit in remaining space of the container
for "_row" from 0 to (lnbSize _control select 0) - 1 do { for "_row" from 0 to (lnbSize _control select 0) - 1 do {
_mass = _rightPanelCache getOrDefault [_control lnbData [_row, 0], 0]; _item = _control lnbData [_row, 0];
_color = _control lnbColor [_row, 1]; _color = _control lnbColor [_row, 1];
// Lower alpha on color for items that can't fit // Lower alpha on color for items that can't fit
_alpha = [0.25, 1] select (_mass <= _loadRemaining); _alpha = [0.25, 1] select (_container canAdd _item);
_color set [3, _alpha]; _color set [3, _alpha];
_control lnbSetColor [[_row, 1], _color]; _control lnbSetColor [[_row, 1], _color];
_control lnbSetColor [[_row, 2], [1, 1, 1, _alpha]]; _control lnbSetColor [[_row, 2], [1, 1, 1, _alpha]];
@ -55,6 +54,6 @@ private _curSel = lnbCurSelRow _control;
// Disable '+' button if item is unique or too big to fit in remaining space // Disable '+' button if item is unique or too big to fit in remaining space
if (_curSel != -1) then { if (_curSel != -1) then {
private _plusButtonCtrl = _display displayCtrl IDC_arrowPlus; private _plusButtonCtrl = _display displayCtrl IDC_arrowPlus;
_plusButtonCtrl ctrlEnable !((_control lnbValue [_curSel, 2]) == 1 || {(_rightPanelCache getOrDefault [_control lnbData [_curSel, 0], 0]) > _loadRemaining}); _plusButtonCtrl ctrlEnable ((_control lnbValue [_curSel, 2]) != 1 && {_container canAdd (_control lnbData [_curSel, 0])});
_plusButtonCtrl ctrlCommit FADE_DELAY; _plusButtonCtrl ctrlCommit FADE_DELAY;
}; };