Skip to content

equipviewer validate bags fix #2160

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

Merged
z16 merged 1 commit into from
Feb 18, 2022
Merged

equipviewer validate bags fix #2160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions addons/GearSwap/validate.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ function search_bags_for_items_in_set(gear_table, filter, missing_items, stack)
if type(name) == 'string' and name ~= 'empty' and name ~= '' and type(i) == 'string' then
if not slot_map[i] then
msg.addon_msg(123,windower.to_shift_jis(tostring(i))..' contains a "name" element but is not a valid slot.')
elseif tryfilter(lowercase_name(name), filter) and not find_in_inv(items.inventory, name, aug) and not find_in_inv(items.wardrobe, name, aug) and not find_in_inv(items.wardrobe2, name, aug) then
missing_items:add(lowercase_name(name))
elseif tryfilter(lowercase_name(name), filter) and not find_in_equippable_inventories(name, aug) then
missing_items:add({name=lowercase_name(name),aug=aug})
end
elseif type(name) == 'table' and name ~= empty then
if not stack then stack = S{} end
Expand All @@ -223,6 +223,15 @@ function search_bags_for_items_in_set(gear_table, filter, missing_items, stack)
return missing_items
end

-- Utility function to search equippable inventories
function find_in_equippable_inventories(name,aug)
for _,bag in pairs(equippable_item_bags) do
if find_in_inv(items[to_windower_bag_api(bag.en)], name, aug) then
return true
end
end
end

-- Utility function to help search sets
function find_in_sets(item, tab, stack)
if stack and stack:contains(tab) then
Expand Down