Merge remote-tracking branch 'origin/master' into autocheese

Author: chdoc

changelog.txt

@@ -26,10 +26,25 @@ Template for new versions:
 
 # Future
 
+## New Tools
+
+- `autocheese`: automatically make cheese using barrels that have accumulated sufficient milk
+
+## New Features
+
+## Fixes
+- `deathcause`: fix error when retrieving the name of a historical figure
+
+## Misc Improvements
+
+## Removed
+
+# 50.15-r2
+
 ## New Tools
 - `fix/stuck-squad`: allow squads and messengers returning from missions to rescue squads that have gotten stuck on the world map
 - `gui/rename`: (reinstated) give new in-game language-based names to anything that can be named (e.g. units, governments, fortresses, or the world)
-- `autocheese`: automatically make cheese using barrels that have accumulated sufficient milk
+- `gui/rename`: (reinstated) give new in-game language-based names to anything that can be named (units, governments, fortresses, the world, etc.)
 
 ## New Features
 - `gui/settings-manager`: new overlay on the Labor -> Standing Orders tab for configuring the number of barrels to reserve for job use (so you can brew alcohol and not have all your barrels claimed by stockpiles for container storage)
@@ -51,8 +66,6 @@ Template for new versions:
 - `fix/wildlife`: don't vaporize stuck wildlife that is onscreen -- kill them instead (as if they died from old age)
 - `gui/sitemap`: show primary group affiliation for visitors and invaders (e.g. civilization name or performance troupe)
 
-## Removed
-
 # 50.15-r1
 
 # 50.14-r2

deathcause.lua

@@ -75,7 +75,7 @@ function displayDeathEventHistFigUnit(histfig_unit, event)
     if slayer_histfig then
         str = str .. (", killed by the %s %s"):format(
                 getRaceNameSingular(slayer_histfig.race),
-                dfhack.translation.translateName(dfhack.units.getVisiblename(slayer_histfig))
+                dfhack.translation.translateName(dfhack.units.getVisibleName(slayer_histfig))
         )
     end
 

gui/rename.lua

@@ -253,17 +253,20 @@ local function select_new_target(cb)
     if #df.global.world.items.other.ANY_ARTIFACT > 0 then
         table.insert(choices, {text='An artifact', data={fn=select_artifact}})
     end
+    if #df.global.world.units.all > 0 then
+        table.insert(choices, {text='A unit', data={fn=select_unit}})
+    end
     local site = dfhack.world.getCurrentSite()
     local is_fort_mode = dfhack.world.isFortressMode()
     local fort = is_fort_mode and df.historical_entity.find(df.global.plotinfo.group_id)
     local civ = is_fort_mode and df.historical_entity.find(df.global.plotinfo.civ_id)
     if site then
-        if #site.buildings > 0 then
-            table.insert(choices, {text='A location', data={fn=curry(select_location, site)}})
-        end
         if fort and #fort.squads > 0 then
             table.insert(choices, {text='A squad', data={fn=curry(select_squad, fort)}})
         end
+        if #site.buildings > 0 then
+            table.insert(choices, {text='A location', data={fn=curry(select_location, site)}})
+        end
         table.insert(choices, {text='This fortress/site', data={fn=curry(select_site, site)}})
     end
     if fort then
@@ -272,10 +275,7 @@ local function select_new_target(cb)
     if civ then
         table.insert(choices, {text='The civilization of this fortress', data={fn=curry(select_entity, civ)}})
     end
-    if #df.global.world.units.all > 0 then
-        table.insert(choices, {text='A unit', data={fn=select_unit}})
-    end
-    table.insert(choices, {text='This world', data={fn=select_world}})
+    table.insert(choices, {text='The world', data={fn=select_world}})
     dlg.showListPrompt('Rename', 'What would you like to rename?', COLOR_WHITE,
         choices, function(_, choice) choice.data.fn(cb) end)
 end

internal/notify/notifications.lua

@@ -536,8 +536,8 @@ NOTIFICATIONS_BY_IDX = {
         end,
         on_click=function()
             local minsSinceSave = dfhack.persistent.getUnsavedSeconds()//60
-            local message = 'It has been ' .. dfhack.formatInt(minsSinceSave) .. ' minutes since your last save. \n\nWould you like to save now? ' ..
-            '(Note: You can also close this reminder and save manually)'
+            local message = 'It has been ' .. dfhack.formatInt(minsSinceSave) .. ' minutes since your last save. \n\nWould you like to save now?\n\n' ..
+            'You can also close this reminder and save manually.'
             dlg.showYesNoPrompt('Save now?', message, nil, function() dfhack.run_script('quicksave') end)
         end,
     },