Skip to content

sort: fix workshop search missing current display names #5921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ab9rf merged 3 commits into from
Sep 19, 2026
+12 −1
Merged

sort: fix workshop search missing current display names #5921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e3c712
sort: include real building display names in places/task search keys
Alistair-Afton Sep 16, 2026
1138e90
use dfhack.buildings.getName instead of leaking df.new strings
Alistair-Afton Sep 17, 2026
46fcd6d
Merge branch 'develop' into fix-workshop-search-names
ab9rf Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ Template for new versions:
- `autodump`: ``destroy`` no longer leaves the contents of destroyed containers in limbo or crashes when destroying unit-held items
- `buildingplan`: fix roller material estimate asking for one chain per tile instead of one chain total
- `buildingplan`: fix "Unlink all" only unlinking some mechanisms (or crashing) when freeing mechanisms from the building
- `sort`: fix the Places/Workshops and task searches missing workshops by their current display names (e.g. "Stoneworker's Workshop", "Screw Press")
- `stocks`: overlay now resets scroll position when collapsing categories so the item list is no longer left blank and unscrollable
- `tiletypes`: remove plants (including trees) rooted on a tile that is painted into something that cannot host them, so cleared ground no longer regrows floating trees
- `timestream`: deal properly with units who have breathing difficulties
- `stocks`: overlay now resets scroll position when collapsing categories so the item list is no longer left blank and unscrollable
- Fixed persistent site data API (``dfhack.persistent.saveSiteData``/``getSiteData``) failing on newly reclaimed fortresses until the first save

## Misc Improvements
Expand Down
4 changes: 4 additions & 0 deletions plugins/lua/sort/info.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ local function get_task_search_key(cri_unit)
table.insert(result, bld.name)
local btype = bld:getType()
if btype == df.building_type.Workshop then
-- the display name may differ from the enum item name (e.g.
-- Masons -> "Stoneworker's Workshop") and is the raw-defined
-- name for custom workshops
table.insert(result, dfhack.buildings.getName(bld))
table.insert(result, df.workshop_type.attrs[bld.type].name or '')
table.insert(result, df.workshop_type[bld.type])
elseif btype == df.building_type.Furnace then
Expand Down
6 changes: 6 additions & 0 deletions plugins/lua/sort/places.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@ local function get_workshop_search_key(workshop)
end

table.insert(result, workshop.name)

-- the display name may differ from the enum item name (e.g. Masons ->
-- "Stoneworker's Workshop") and is the raw-defined name for custom
-- workshops
table.insert(result, dfhack.buildings.getName(workshop))

table.insert(result, df.workshop_type.attrs[workshop.type].name or '')
table.insert(result, df.workshop_type[workshop.type])

Expand Down
Loading