From f837532b42b5a27952ba13d142ff1c513deb899b Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 13 Sep 2020 17:12:29 -0700 Subject: [PATCH 1/2] use more precise item vectors for bld item filters --- library/lua/dfhack/buildings.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/library/lua/dfhack/buildings.lua b/library/lua/dfhack/buildings.lua index 49e1bd09e..995f90972 100644 --- a/library/lua/dfhack/buildings.lua +++ b/library/lua/dfhack/buildings.lua @@ -73,13 +73,13 @@ local building_inputs = { { item_type=df.item_type.SMALLGEM, quantity=3, - vector_id=df.job_item_vector_id.ANY_GENERIC35 + vector_id=df.job_item_vector_id.SMALLGEM } }, [df.building_type.Well] = { { item_type=df.item_type.BLOCKS, - vector_id=df.job_item_vector_id.ANY_GENERIC35 + vector_id=df.job_item_vector_id.BLOCKS }, { name='bucket', @@ -116,7 +116,7 @@ local building_inputs = { [df.building_type.ScrewPump] = { { item_type=df.item_type.BLOCKS, - vector_id=df.job_item_vector_id.ANY_GENERIC35 + vector_id=df.job_item_vector_id.BLOCKS }, { name='screw', @@ -140,10 +140,10 @@ local building_inputs = { [df.building_type.GrateWall] = { { item_type=df.item_type.GRATE, vector_id=df.job_item_vector_id.GRATE } }, [df.building_type.GrateFloor] = { { item_type=df.item_type.GRATE, vector_id=df.job_item_vector_id.GRATE } }, [df.building_type.BarsVertical] = { - { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.ANY_GENERIC35 } + { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.BAR } }, [df.building_type.BarsFloor] = { - { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.ANY_GENERIC35 } + { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.BAR } }, [df.building_type.GearAssembly] = { { @@ -176,9 +176,9 @@ local building_inputs = { vector_id=df.job_item_vector_id.TRACTION_BENCH } }, - [df.building_type.Slab] = { { item_type=df.item_type.SLAB } }, - [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL } }, - [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL } }, + [df.building_type.Slab] = { { item_type=df.item_type.SLAB, vector_id=df.job_item_vector_id.SLAB } }, + [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } }, + [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } }, [df.building_type.Rollers] = { { name='mechanism', @@ -248,7 +248,7 @@ local workshop_inputs = { [df.workshop_type.Ashery] = { { item_type=df.item_type.BLOCKS, - vector_id=df.job_item_vector_id.ANY_GENERIC35 + vector_id=df.job_item_vector_id.BLOCKS }, { name='barrel', @@ -514,4 +514,4 @@ function buildings.constructBuilding(info) ) end -return buildings \ No newline at end of file +return buildings From 3c51bb51ab21d3b72c6827446768df9f2e6e037c Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Mon, 28 Sep 2020 23:14:13 -0700 Subject: [PATCH 2/2] remove references to non-existent vector ids --- library/lua/dfhack/buildings.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/lua/dfhack/buildings.lua b/library/lua/dfhack/buildings.lua index 995f90972..54f6fa19c 100644 --- a/library/lua/dfhack/buildings.lua +++ b/library/lua/dfhack/buildings.lua @@ -176,9 +176,9 @@ local building_inputs = { vector_id=df.job_item_vector_id.TRACTION_BENCH } }, - [df.building_type.Slab] = { { item_type=df.item_type.SLAB, vector_id=df.job_item_vector_id.SLAB } }, - [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } }, - [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } }, + [df.building_type.Slab] = { { item_type=df.item_type.SLAB } }, + [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL } }, + [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL } }, [df.building_type.Rollers] = { { name='mechanism',