Show geld status and custom profession in animal zone assignment window #4182
Conversation
| @@ -562,16 +575,21 @@ function AssignAnimal:cache_choices() | |||
| for _, unit in ipairs(df.global.world.units.active) do | |||
| if not is_assignable_unit(unit) then goto continue end | |||
| local raw = df.creature_raw.find(unit.race) | |||
| local desc = dfhack.units.getReadableName(unit) | |||
| if type(unit.custom_profession) == 'string' and #unit.custom_profession > 0 then | |||
| desc = unit.custom_profession .. ', ' .. desc | |||
There was a problem hiding this comment.
adding the custom profession before the name looks a little strange, IMHO. Adding at the end, after the readable name, would be better, but not ideal.
We could make this a feature of all tools that use getReadableName by integrating the custom profession name into there, perhaps added just before the race name. That would have to be accompanied by an audit of all tools that use that call (not too many -- getReadableName was added within the past year) and ensuring that information isn't duplicated.
There was a problem hiding this comment.
I'm not really sure that custom profession should appear everywhere through getReadableName. sortoverlay.lua uses getReadableName + getProfessionName as a search key. Animal stockpiles are a special case, where profession doesn't really bear any meaning, never gets assigned by game and gets used as just another field for tagging. Probably adding an option is better:
string Units::getReadableName(df::unit* unit, bool include_custom_profession = false)There was a problem hiding this comment.
Another option is to attempt to split by ", " in lua code, to insert custom profession after the name.
Although I agree this is little strange, that profession goes before the name, but that's the info I care about the most, since I type this manually. Game-generated names of pets are just random gibberish that doesn't help to pick animals for zones.
There was a problem hiding this comment.
That is a fair point. For the people who do use professions to categorize their livestock, they'll want it first so it can determine the sort order. Let me load this into my game and see what it looks like with prisoners and citizens and such
There was a problem hiding this comment.
Ok, you convinced me on the string ordering : )
Could you add a note to the changelog about this improvement? https://github.com/DFHack/scripts/blob/master/changelog.txt#L51
|
Thank you for this. In a separate PR, please feel free to add your name to our list of Authors! |
If player doesn't use custom profession field, nothing will change for them. Geld status sorts along with gender as a composite key (gender, is_gelded).