include residents in citizens list where applicable

myk002 · myk002 · commit 23c761a41e6d · 2024-03-14T17:23:46.000-07:00
diff --git a/allneeds.lua b/allneeds.lua
@@ -26,8 +26,8 @@ if units then
     print(('Summarizing needs for %s:'):format(dfhack.units.getReadableName(units)))
     units = {units}
 else
-    print('Summarizing needs for all (sane) citizens:')
-    units = dfhack.units.getCitizens(false)
+    print('Summarizing needs for all (sane) citizens and residents:')
+    units = dfhack.units.getCitizens()
 end
 print()
 
diff --git a/combat-harden.lua b/combat-harden.lua
@@ -79,7 +79,7 @@ function main(args)
             qerror('--citizens requires fortress mode')
         end
 
-        for _, unit in ipairs(dfhack.units.getCitizens(false)) do
+        for _, unit in ipairs(dfhack.units.getCitizens()) do
             table.insert(unitsList, unit)
         end
     end
diff --git a/docs/combat-harden.rst b/docs/combat-harden.rst
@@ -28,8 +28,8 @@ Unit options
 ``--all``
     All active units will be affected.
 ``--citizens``
-    All citizens of your fort will be affected. Will do nothing in adventure
-    mode.
+    All citizens and residents of your fort will be affected. Will do nothing
+    in adventure mode.
 ``--unit <id>``
     The given unit will be affected.
 
diff --git a/docs/fillneeds.rst b/docs/fillneeds.rst
@@ -15,4 +15,4 @@ Usage
 ``fillneeds --unit <id>``
     Make the specified unit focused and unstressed.
 ``fillneeds --all``
-    Make all units focused and unstressed.
+    Make all citizens and residents focused and unstressed.
diff --git a/fillneeds.lua b/fillneeds.lua
@@ -14,7 +14,7 @@ function satisfyNeeds(unit)
 end
 
 if args.all then
-    for _, unit in ipairs(dfhack.units.getCitizens(true)) do
+    for _, unit in ipairs(dfhack.units.getCitizens()) do
         satisfyNeeds(unit)
     end
 else
diff --git a/fix/stuck-worship.lua b/fix/stuck-worship.lua
@@ -79,7 +79,7 @@ local function get_prayer_targets(unit)
     end
 end
 
-for _,unit in ipairs(dfhack.units.getCitizens(true)) do
+for _,unit in ipairs(dfhack.units.getCitizens(false, true)) do
     local prayer_targets = get_prayer_targets(unit)
     if not unit.status.current_soul or not prayer_targets then
         goto next_unit
diff --git a/gui/unit-syndromes.lua b/gui/unit-syndromes.lua
@@ -300,18 +300,6 @@ local function getUnitSyndromes(unit)
     return unit_syndromes
 end
 
-local function getCitizens()
-    local units = {}
-
-    for _, unit in pairs(df.global.world.units.active) do
-        if dfhack.units.isCitizen(unit) and dfhack.units.isDwarf(unit) then
-            table.insert(units, unit)
-        end
-    end
-
-    return units
-end
-
 local function getLivestock()
     local units = {}
 
@@ -382,7 +370,7 @@ function UnitSyndromes:init()
                     view_id = 'category',
                     frame = {t = 0, l = 0},
                     choices = {
-                        { text = "Dwarves", get_choices = getCitizens },
+                        { text = "Dwarves", get_choices = curry(dfhack.units.getCitizens, false, true) },
                         { text = "Livestock", get_choices = getLivestock },
                         { text = "Wild animals", get_choices = getWildAnimals },
                         { text = "Hostile", get_choices = getHostiles },
diff --git a/internal/notify/notifications.lua b/internal/notify/notifications.lua
@@ -94,7 +94,7 @@ local function for_starving(fn, reverse)
 end
 
 local function for_moody(fn, reverse)
-    for_iter(dfhack.units.getCitizens(false), function(unit)
+    for_iter(dfhack.units.getCitizens(true), function(unit)
         local job = unit.job.current_job
         return job and df.job_type_class[df.job_type.attrs[job.job_type].type] == 'StrangeMood'
     end, fn, reverse)
diff --git a/list-waves.lua b/list-waves.lua
@@ -78,7 +78,7 @@ local function getWave(dwf)
     end
 end
 
-for _,v in ipairs(dfhack.units.getCitizens(false)) do
+for _,v in ipairs(dfhack.units.getCitizens(true, true)) do
     getWave(v)
 end
 
diff --git a/uniform-unstick.lua b/uniform-unstick.lua
@@ -264,7 +264,7 @@ local function main(args)
 
     if args.all then
         local need_newline = false
-        for _, unit in ipairs(dfhack.units.getCitizens(false)) do
+        for _, unit in ipairs(dfhack.units.getCitizens(true)) do
             do_drop(process(unit, args, need_newline))
             need_newline = true
         end
diff --git a/warn-stranded.lua b/warn-stranded.lua
@@ -62,7 +62,7 @@ function getStrandedGroups()
     local groupCount = 0
     local unitsByWalkGroup, ignoredUnitsByWalkGroup = {}, {}
 
-    for _, unit in ipairs(dfhack.units.getCitizens(false)) do
+    for _, unit in ipairs(dfhack.units.getCitizens(true)) do
         local unitPos = xyz2pos(dfhack.units.getPosition(unit))
         local walkGroup = getWalkGroup(unitPos)
 
@@ -380,7 +380,7 @@ local function getStrandedGroupsWithIgnored(groupList, ignoredUnitsByWalkGroup,
 end
 
 local function findCitizen(unitId)
-    for _, citizen in ipairs(dfhack.units.getCitizens(true)) do
+    for _, citizen in ipairs(dfhack.units.getCitizens(true, true)) do
         if citizen.id == unitId then return citizen end
     end
 
