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

More code reuse with sort/locationselector

develop
Ryan Dwyer 2023-11-08 17:36:31 -08:00
parent a21695ccc2
commit 674bf94344
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/lua/sort/locationselector.lua
Unescape Escape View File

@ -50,7 +50,7 @@ function get_religion_string(religion_id, religion_type)
return ('%s %s'):format(dfhack.TranslateName(entity.name, true), stringify_spheres(spheres))
end
local function get_profession_string(profession)
function get_profession_string(profession)
return df.profession[profession]:gsub('_', ' ')
end

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

@ -101,9 +101,7 @@ local function get_location_search_key(zone)
if language_name_types[building.name.type] == 'Temple' then
table.insert(result, get_location_religion(building.deity_data.Deity or building.deity_data.Religion, building.deity_type))
elseif language_name_types[building.name.type] == 'Guildhall' then
-- Broke this up into two locals because table.insert doesn't like it all being inside the second argument for some reason
local profession = df.profession[building.contents.profession]
local dwarfified_profession = profession:gsub('[Mm][Aa][Nn]', 'dwarf') -- Craftsman becomes Craftsdwarf, etc
local dwarfified_profession = locationselector.get_profession_string(building.contents.profession):gsub('[Mm][Aa][Nn]', 'dwarf') -- Craftsman becomes Craftsdwarf, etc
table.insert(result, dwarfified_profession)
end