From 123c207d9cc159e005cc04529a2b648a68447af4 Mon Sep 17 00:00:00 2001 From: lethosor Date: Mon, 14 Dec 2020 00:03:29 -0500 Subject: [PATCH] Fix error in material_defs lookups Changed in dfhack/df-structures@7dfea1f1d4e453b97d5529785701db46360596ce Fixes #1722 --- plugins/lua/workflow.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/lua/workflow.lua b/plugins/lua/workflow.lua index 9122f290d..b3b5d80f5 100644 --- a/plugins/lua/workflow.lua +++ b/plugins/lua/workflow.lua @@ -206,17 +206,16 @@ local plant_products = { } for job,flag in pairs(plant_products) do - local ttag = 'type_'..string.lower(flag) - local itag = 'idx_'..string.lower(flag) + local tag = string.lower(flag) job_outputs[job] = function(callback, job) local mat_type, mat_index = -1, -1 local seed_type, seed_index = -1, -1 local mat = dfhack.matinfo.decode(job.job_items[0]) if mat and mat.plant and mat.plant.flags[flag] then - mat_type = mat.plant.material_defs[ttag] - mat_index = mat.plant.material_defs[itag] - seed_type = mat.plant.material_defs['type_seed'] - seed_index = mat.plant.material_defs['idx_seed'] + mat_type = mat.plant.material_defs.type[tag] + mat_index = mat.plant.material_defs.idx[tag] + seed_type = mat.plant.material_defs.type.seed + seed_index = mat.plant.material_defs.idx.seed end local mat_mask = { } if flag ~= 'LEAVES' then