From d845ac9f4fa3aac0773b36bbaa77f5785fc044de Mon Sep 17 00:00:00 2001 From: Kevin Donnelly Date: Fri, 30 Aug 2024 16:43:38 -0400 Subject: [PATCH 1/3] Adding fix/dry-buckets to the control panel at one week --- internal/control-panel/registry.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/control-panel/registry.lua b/internal/control-panel/registry.lua index c7b591f8e3..fc2ff0ae35 100644 --- a/internal/control-panel/registry.lua +++ b/internal/control-panel/registry.lua @@ -71,6 +71,9 @@ COMMANDS_BY_IDX = { {command='fix/dead-units', group='bugfix', mode='repeat', default=true, desc='Fix units still being assigned to burrows after death.', params={'--time', '7', '--timeUnits', 'days', '--command', '[', 'fix/dead-units', '--burrow', '-q', ']'}}, + {command='fix/dry-buckets', group='bugfix', mode='repeat', default=true, + desc='Allow discarded water buckets to be used again.', + params={'--time', '7', '--timeUnits', 'days', '--command', '[', 'fix/dry-buckets', ']'}}, {command='fix/empty-wheelbarrows', group='bugfix', mode='repeat', default=true, desc='Make abandoned full wheelbarrows usable again.', params={'--time', '1', '--timeUnits', 'days', '--command', '[', 'fix/empty-wheelbarrows', '-q', ']'}}, From ed203d0b8263165fb59cd35bf9c0e31ec7bae6f6 Mon Sep 17 00:00:00 2001 From: Kevin Donnelly Date: Fri, 30 Aug 2024 16:55:41 -0400 Subject: [PATCH 2/3] Added --quiet / -q flag to fix/dry-buckets --- fix/dry-buckets.lua | 16 +++++++++++++--- internal/control-panel/registry.lua | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fix/dry-buckets.lua b/fix/dry-buckets.lua index b49e5b161f..27834abb82 100644 --- a/fix/dry-buckets.lua +++ b/fix/dry-buckets.lua @@ -1,7 +1,15 @@ +local argparse = require("argparse") + +local quiet = false + local emptied = 0 local in_building = 0 local water_type = dfhack.matinfo.find('WATER').type +argparse.processArgsGetopt({...}, { + {'q', 'quiet', handler=function() quiet = true end}, +}) + for _,item in ipairs(df.global.world.items.other.IN_PLAY) do local container = dfhack.items.getContainer(item) if container @@ -19,7 +27,9 @@ for _,item in ipairs(df.global.world.items.other.IN_PLAY) do end end -print('Emptied '..emptied..' buckets.') -if emptied > 0 then - print(('Unclogged %d wells.'):format(in_building)) +if not quiet then + print('Emptied '..emptied..' buckets.') + if emptied > 0 then + print(('Unclogged %d wells.'):format(in_building)) + end end diff --git a/internal/control-panel/registry.lua b/internal/control-panel/registry.lua index fc2ff0ae35..93cb2d632b 100644 --- a/internal/control-panel/registry.lua +++ b/internal/control-panel/registry.lua @@ -73,7 +73,7 @@ COMMANDS_BY_IDX = { params={'--time', '7', '--timeUnits', 'days', '--command', '[', 'fix/dead-units', '--burrow', '-q', ']'}}, {command='fix/dry-buckets', group='bugfix', mode='repeat', default=true, desc='Allow discarded water buckets to be used again.', - params={'--time', '7', '--timeUnits', 'days', '--command', '[', 'fix/dry-buckets', ']'}}, + params={'--time', '7', '--timeUnits', 'days', '--command', '[', 'fix/dry-buckets', '-q', ']'}}, {command='fix/empty-wheelbarrows', group='bugfix', mode='repeat', default=true, desc='Make abandoned full wheelbarrows usable again.', params={'--time', '1', '--timeUnits', 'days', '--command', '[', 'fix/empty-wheelbarrows', '-q', ']'}}, From ffd05f36f3327818fcded1936f734a20a1b143ef Mon Sep 17 00:00:00 2001 From: Myk Date: Fri, 30 Aug 2024 15:54:20 -0700 Subject: [PATCH 3/3] tweak description --- internal/control-panel/registry.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/control-panel/registry.lua b/internal/control-panel/registry.lua index 93cb2d632b..5f20954cc2 100644 --- a/internal/control-panel/registry.lua +++ b/internal/control-panel/registry.lua @@ -72,7 +72,7 @@ COMMANDS_BY_IDX = { desc='Fix units still being assigned to burrows after death.', params={'--time', '7', '--timeUnits', 'days', '--command', '[', 'fix/dead-units', '--burrow', '-q', ']'}}, {command='fix/dry-buckets', group='bugfix', mode='repeat', default=true, - desc='Allow discarded water buckets to be used again.', + desc='Allow discarded water buckets and clogged wells to be used again.', params={'--time', '7', '--timeUnits', 'days', '--command', '[', 'fix/dry-buckets', '-q', ']'}}, {command='fix/empty-wheelbarrows', group='bugfix', mode='repeat', default=true, desc='Make abandoned full wheelbarrows usable again.',