Merge branch 'develop' into adv-beta

DFHack · Apr 17, 2024 · f6b4608 · f6b4608
2 parents 38c4bdc + 39df403
commit f6b4608
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
@@ -4719,9 +4719,9 @@ Here is an example skeleton for a ZScreen tool window::
     end
 
     -- implement if you need to handle custom input
-    function MyWindow:onInput(keys)
-        return MyWindow.super.onInput(self, keys)
-    end
+    --function MyWindow:onInput(keys)
+    --    return MyWindow.super.onInput(self, keys)
+    --end
 
     MyScreen = defclass(MyScreen, gui.ZScreen)
     MyScreen.ATTRS {

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
@@ -1374,6 +1374,14 @@ string Units::getReadableName(df::unit* unit) {
             break;
         }
     }
+
+    if (unit->enemy.undead) {
+        if (unit->enemy.undead->undead_name.empty())
+            name = name + " Corpse";
+        else
+            name = name + " " + unit->enemy.undead->undead_name;
+    }
+
     if (isTame(unit)) {
         name += " (";
         name += getTameTag(unit);

diff --git a/scripts b/scripts
+1 −0		changelog.txt
+4 −1		docs/gui/unit-info-viewer.rst
+2 −2		gui/autofish.lua
+440 −740		gui/unit-info-viewer.lua