MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stockpile double-format, add assigned unit to workshop search

develop
Ryan Dwyer 2023-11-13 19:42:48 -08:00
parent fdf99fd65b
commit 8869480a57
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/lua/sort/places.lua
Unescape Escape View File

@ -112,14 +112,22 @@ local function get_location_search_key(zone)
end end
local function get_stockpile_search_key(stockpile) local function get_stockpile_search_key(stockpile)
-- I put the stockpile_number in twice so you can search both with and without the octothorpe
-- (e.g. if your unnamed stockpile is listed as "Stockpile #16" you can search both "#16" or "16")
if #stockpile.name ~= 0 then return stockpile.name if #stockpile.name ~= 0 then return stockpile.name
else return ('Stockpile #%s %s'):format(stockpile.stockpile_number, stockpile.stockpile_number) end else return ('Stockpile #%s'):format(stockpile.stockpile_number) end
end end
local function get_workshop_search_key(workshop) local function get_workshop_search_key(workshop)
return ('%s %s %s'):format(workshop.name, df.workshop_type.attrs[workshop.type].name or '', df.workshop_type[workshop.type]) local result = {}
for _, unit_id in ipairs(workshop.profile.permitted_workers) do
local unit = df.unit.find(unit_id)
if unit then table.insert(result, sortoverlay.get_unit_search_key(unit)) end
end
table.insert(result, workshop.name)
table.insert(result, df.workshop_type.attrs[workshop.type].name or '')
table.insert(result, df.workshop_type[workshop.type])
return table.concat(result, ' ')
end end
local function get_farmplot_search_key(farmplot) local function get_farmplot_search_key(farmplot)