Merge pull request #3859 from myk002/myk_readable

[zone] label war and hunt trained animals in readable names

docs/changelog.txt

@@ -66,6 +66,7 @@ Template for new versions:
 - `overlay`: allow ``overlay_onupdate_max_freq_seconds`` to be dynamically set to 0 for a burst of high-frequency updates
 - `orders`: ``recheck`` command now only resets orders that have conditions that can be rechecked
 - `sort`: added help button for squad assignment search/filter/sort
+- `zone`: animals trained for war or hunting are now labeled as such in animal assignment screens
 
 ## Documentation
 

docs/dev/Lua API.rst

@@ -1609,7 +1609,8 @@ Units module
 * ``dfhack.units.getReadableName(unit)``
 
   Returns a string that includes the language name of the unit (if any), the
-  race of the unit, and any syndrome-given descriptions (such as "necromancer").
+  race of the unit, whether it is trained for war or hunting, and any
+  syndrome-given descriptions (such as "necromancer").
 
 * ``dfhack.units.getStressCategory(unit)``
 

library/modules/Units.cpp

@@ -1267,6 +1267,10 @@ static string get_caste_name(df::unit* unit) {
 
 string Units::getReadableName(df::unit* unit) {
     string race_name = isChild(unit) ? getRaceChildName(unit) : get_caste_name(unit);
+    if (isHunter(unit))
+        race_name = "hunter " + race_name;
+    if (isWar(unit))
+        race_name = "war " + race_name;
     string name = Translation::TranslateName(getVisibleName(unit));
     if (name.empty()) {
         name = race_name;