|
|
@ -206,17 +206,16 @@ local plant_products = {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for job,flag in pairs(plant_products) do
|
|
|
|
for job,flag in pairs(plant_products) do
|
|
|
|
local ttag = 'type_'..string.lower(flag)
|
|
|
|
local tag = string.lower(flag)
|
|
|
|
local itag = 'idx_'..string.lower(flag)
|
|
|
|
|
|
|
|
job_outputs[job] = function(callback, job)
|
|
|
|
job_outputs[job] = function(callback, job)
|
|
|
|
local mat_type, mat_index = -1, -1
|
|
|
|
local mat_type, mat_index = -1, -1
|
|
|
|
local seed_type, seed_index = -1, -1
|
|
|
|
local seed_type, seed_index = -1, -1
|
|
|
|
local mat = dfhack.matinfo.decode(job.job_items[0])
|
|
|
|
local mat = dfhack.matinfo.decode(job.job_items[0])
|
|
|
|
if mat and mat.plant and mat.plant.flags[flag] then
|
|
|
|
if mat and mat.plant and mat.plant.flags[flag] then
|
|
|
|
mat_type = mat.plant.material_defs[ttag]
|
|
|
|
mat_type = mat.plant.material_defs.type[tag]
|
|
|
|
mat_index = mat.plant.material_defs[itag]
|
|
|
|
mat_index = mat.plant.material_defs.idx[tag]
|
|
|
|
seed_type = mat.plant.material_defs['type_seed']
|
|
|
|
seed_type = mat.plant.material_defs.type.seed
|
|
|
|
seed_index = mat.plant.material_defs['idx_seed']
|
|
|
|
seed_index = mat.plant.material_defs.idx.seed
|
|
|
|
end
|
|
|
|
end
|
|
|
|
local mat_mask = { }
|
|
|
|
local mat_mask = { }
|
|
|
|
if flag ~= 'LEAVES' then
|
|
|
|
if flag ~= 'LEAVES' then
|
|
|
|