advfort: is sand bearing fix for glass making, is corpse fix for butchering (todo dissasemble and see how it works really)

develop
Warmist 2013-01-06 18:58:58 +02:00
parent 838e13a80e
commit 87d79b1119
1 changed files with 12 additions and 2 deletions

@ -390,6 +390,12 @@ function isSuitableItem(job_item,item)
end end
end end
end end
if job_item.flags1.sand_bearing and not item:isSandBearing() then
return false,"not sand bearing"
end
if job_item.flags1.butcherable and not (item:getType()== df.item_type.CORPSE or item:getType()==CORPSEPIECE) then
return false,"not butcherable"
end
local matinfo=dfhack.matinfo.decode(item) local matinfo=dfhack.matinfo.decode(item)
--print(matinfo:getCraftClass()) --print(matinfo:getCraftClass())
--print("Matching ",item," vs ",job_item) --print("Matching ",item," vs ",job_item)
@ -695,8 +701,9 @@ function AssignJobItems(args)
if #uncollected == 0 then if #uncollected == 0 then
job.flags.working=true job.flags.working=true
else else
uncollected[1].is_fetching=1
job.flags.fetching=true job.flags.fetching=true
uncollected[1].is_fetching=1
end end
--todo set working for workshops if items are present, else set fetching (and at least one item to is_fetching=1) --todo set working for workshops if items are present, else set fetching (and at least one item to is_fetching=1)
--job.flags.working=true --job.flags.working=true
@ -1041,8 +1048,11 @@ function usetool:farmPlot(building)
args.post_actions={AssignBuildingRef} args.post_actions={AssignBuildingRef}
end end
local job,msg=makeJob(args) local job,msg=makeJob(args)
if job==nil then if not job then
print(msg) print(msg)
else
--print(AssignJobItems(args)) --WHY U NO WORK?
end end
end end
MODES={ MODES={