Merge branch 'dead_misuse' of https://github.com/PatrikLundell/scripts into dead_misuse

PatrikLundell · PatrikLundell · commit 506efceadc5a · 2018-06-18T20:03:32.000+02:00
diff --git a/devel/export-dt-ini.lua b/devel/export-dt-ini.lua
@@ -489,7 +489,7 @@ write_flags('invalid_flags_1', {
     { 'an invader or hostile', { df.unit_flags1.invader_origin } },
     { 'resident, invader or ambusher', { df.unit_flags1.hidden_ambusher, df.unit_flags1.invades } },
     { 'part of a merchant caravan', { df.unit_flags1.forest } },
-    { 'Inactive, currently not in play', { df.unit_flags1.dead } },
+    { 'inactive, currently not in play', { df.unit_flags1.dead } },
     { 'marauder', { df.unit_flags1.marauder } }
 });
 write_flags ('invalid_flags_2', {
diff --git a/fix/feeding-timers.lua b/fix/feeding-timers.lua
@@ -17,7 +17,7 @@ end
 
 local fixcount = 0
 for _,unit in ipairs(df.global.world.units.all) do
- if dfhack.units.isCitizen(unit) and isActive(unit) then
+ if dfhack.units.isCitizen(unit) and dfhack.units.isActive(unit) then
   for _,v in pairs(unit.status.misc_traits) do
    local didfix = 0
    if v.id == 0 then -- I think this should have additional conditions...
