Skip to content

Commit 89080f9

Browse files
authored
Merge pull request DFHack#208 from myk002/quickfort_no_vector_id
quickfort: fix configuration of nest boxes, slabs, and hives
2 parents a574158 + 74b7e9b commit 89080f9

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ that repo.
1515

1616
## Fixes
1717
- `quickfort`: fix handling of modifier keys (e.g. {Ctrl} or {Alt} in query blueprints
18+
- `quickfort`: fix misconfiguration of nest boxes, hives, and slabs that were preventing them from being built from build blueprints
1819

1920
## Misc Improvements
2021
- `quickfort`: add ``query_unsafe`` setting to disable query blueprint error checking. useful for query blueprints that send unusual key sequences.

internal/quickfort/build.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ local building_db = {
247247
h={label='Container', type=df.building_type.Box},
248248
r={label='Weapon Rack', type=df.building_type.Weaponrack},
249249
s={label='Statue', type=df.building_type.Statue},
250-
['{Alt}s']={label='Slab', type=df.building_type.Slab},
250+
['{Alt}s']={label='Slab', type=df.building_type.Slab, skip_vector_id=true},
251251
t={label='Table', type=df.building_type.Table},
252252
g={label='Bridge (Retracting)', type=df.building_type.Bridge,
253253
direction=df.building_bridgest.T_direction.Retracting},
@@ -320,8 +320,8 @@ local building_db = {
320320
A={label='Archery Target', type=df.building_type.ArcheryTarget},
321321
R={label='Traction Bench', type=df.building_type.TractionBench,
322322
additional_orders={'table', 'mechanisms', 'cloth rope'}},
323-
N={label='Nest Box', type=df.building_type.NestBox},
324-
['{Alt}h']={label='Hive', type=df.building_type.Hive},
323+
N={label='Nest Box', type=df.building_type.NestBox, skip_vector_id=true},
324+
['{Alt}h']={label='Hive', type=df.building_type.Hive, skip_vector_id=true},
325325
-- Offering Places, Bookcases, and Display Furniture are not yet supported
326326
-- by dfhack
327327
--['{Alt}a']={label='Offering Place', type=df.building_type.OfferingPlace},
@@ -742,7 +742,8 @@ local function create_building(b)
742742
-- applied to *all* their filters, not just the "generic building
743743
-- material" ones.
744744
local vector_id = nil
745-
if not db_entry.custom then
745+
-- remove skip_vector_id when we move block preferences to buildingplan
746+
if not db_entry.custom and not db_entry.skip_vector_id then
746747
vector_id = df.job_item_vector_id.BLOCKS
747748
end
748749
local filter_mod = {

0 commit comments

Comments
 (0)