MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for eventful and a advfort not to show worn items.

develop
Warmist 2013-03-09 12:54:07 +02:00
parent 5be2ecb080
commit 3ed5f06f49
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/eventful.cpp
Unescape Escape View File

@ -60,7 +60,7 @@ struct ProductInfo {
MaterialSource material; MaterialSource material;
bool isValid() { bool isValid() {
return (material.mat_type >= 0 || material.reagent); return true;//due to mat_type being -1 = any
} }
}; };

6
scripts/gui/advfort.lua
Unescape Escape View File

@ -488,8 +488,10 @@ function getItemsUncollected(job)
end end
return ret return ret
end end
function AddItem(tbl,item,recurse) function AddItem(tbl,item,recurse,skip_add)
if not skip_add then
table.insert(tbl,item) table.insert(tbl,item)
end
if recurse then if recurse then
local subitems=dfhack.items.getContainedItems(item) local subitems=dfhack.items.getContainedItems(item)
if subitems~=nil then if subitems~=nil then
@ -518,6 +520,8 @@ function EnumItems(args)
for k,v in pairs(args.unit.inventory) do for k,v in pairs(args.unit.inventory) do
if args.inv[v.mode] then if args.inv[v.mode] then
AddItem(ret,v.item,args.deep) AddItem(ret,v.item,args.deep)
elseif args.deep then
AddItem(ret,v.item,args.deep,true)
end end
end end
end end