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

Arsenal - Allow increasing quantity of left panel items in cargo #9694

Merged
merged 5 commits into from
Dec 31, 2023
Merged

Arsenal - Allow increasing quantity of left panel items in cargo #9694

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c532849
Unique items fix
johnb432 Dec 30, 2023
36a5a5b
attachment lookup
LinkIsGrim Dec 30, 2023
08a0146
container item lookup
LinkIsGrim Dec 30, 2023
a813d67
allow increasing quantity of misplaced virtual items
LinkIsGrim Dec 31, 2023
4fd4417
Merge branch 'master' of https://github.com/acemod/ACE3 into virtualI…
LinkIsGrim Dec 31, 2023
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
6 changes: 3 additions & 3 deletions addons/arsenal/functions/fnc_fillRightPanel.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,9 @@ switch (_ctrlIDC) do {
// Unknown items
{
if !(_x in _items) then {
["CfgWeapons", _x, true, true, true] call _fnc_fillRightContainer;
["CfgWeapons", _x, true, !(_x in GVAR(virtualItemsFlat)), true] call _fnc_fillRightContainer;
};
} forEach (keys (GVAR(virtualItems) get IDX_VIRT_UNIQUE_UNKNOWN_ITEMS));
} 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
};
// Custom buttons
default {
Expand Down Expand Up @@ -363,7 +363,7 @@ switch (_ctrlIDC) do {
};
// Unknown items
case (_x in (GVAR(virtualItems) get IDX_VIRT_UNIQUE_UNKNOWN_ITEMS)): {
["CfgWeapons", _x, true, true, true] call _fnc_fillRightContainer;
["CfgWeapons", _x, true, !(_x in GVAR(virtualItemsFlat)), true] call _fnc_fillRightContainer;
};
};
} forEach _items;
Expand Down