From f837532b42b5a27952ba13d142ff1c513deb899b Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 13 Sep 2020 17:12:29 -0700 Subject: [PATCH 1/5] 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/5] 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', From c73b1f03afaa0bb9cb4a8e07807894bd982c6c07 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Tue, 29 Sep 2020 00:22:16 -0700 Subject: [PATCH 3/5] buckets can be lye- and milk-free otherwise the bucket for wells can never be matched --- library/modules/Items.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp index 0e02043dc..3d35edb29 100644 --- a/library/modules/Items.cpp +++ b/library/modules/Items.cpp @@ -379,6 +379,7 @@ bool ItemTypeInfo::matches(const df::job_item &item, MaterialInfo *mat, bool ski break; case BUCKET: + OK(2,lye_milk_free); case FLASK: OK(1,milk); xmask1.bits.cookable = true; From 93d43ba9e3099f3238491ec0b75a7b6d7bea5d2c Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 29 Sep 2020 20:08:35 -0400 Subject: [PATCH 4/5] Update changelog (#1620, #1660) --- docs/changelog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index c7ab70b8e..f3d5cc1ed 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -33,7 +33,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: # Future +## New Plugins +- `xlsxreader`: provides an API for Lua scripts to read Excel spreadsheets + ## Fixes +- `buildingplan`: fixed handling of buildings that require buckets - `getplants`: fixed a crash that could occur on some maps - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching - `stockpiles`: fixed a crash when loading food stockpiles From 4e7ca99db189f7ee06c95b10ed3cb50dccb73785 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 1 Oct 2020 21:31:59 -0400 Subject: [PATCH 5/5] Update scripts --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index 436b98f6b..0d7fbec48 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 436b98f6b2dd8a8a845e5eccaeaecd5024dc1b9f +Subproject commit 0d7fbec48e959ba88c885975aecbb034fa5f5c57