Script to commute the prison sentence of a convicted criminal #1200

master-spike · 2024-06-20T21:02:22Z

myk002 · 2024-06-21T18:35:32Z

commute-sentence isn't quite as discoverable as I'd like it to be. Could we instead call it justice? The initial functionality here could be invoked as justice pardon, and the overall syntax would be:

justice <command> [<options>]

with just the one command (pardon) for now. it should at least take a -u, --unit option to allow specific unit ids to be specified, and if no id is specified then it defaults to the selected unit.

myk002 · 2024-06-22T01:09:09Z

docs/justice.rst

+=======
+
+.. dfhack-tool::
+    :summary: Commands related to the justice system


Suggested change

:summary: Commands related to the justice system

:summary: Commands related to the justice system.

myk002 · 2024-06-22T01:09:21Z

docs/justice.rst

+This tool allows control over aspects of the justice system, such as the
+ability to pardon criminals.
+
+usage


Suggested change

usage

Usage

myk002 · 2024-06-22T01:09:49Z

docs/justice.rst

+::
+    justice pardon [--unit <id>]
+
+Pardon the selected unit or the one specified by unit id if provided. Currently


Suggested change

Pardon the selected unit or the one specified by unit id if provided. Currently

Pardon the selected unit or the one specified by unit id (if provided). Currently

myk002 · 2024-06-22T01:09:57Z

docs/justice.rst

+only applies to prison time and doesn't cancel beatings or hammerings.
+
+
+options


Suggested change

options

Options

myk002 · 2024-06-22T01:11:18Z

justice.lua

+        unit = df.unit.find(unit_id)
+        if not unit then qerror(("No unit with id %i"):format(unit_id)) end
+    end
+    if unit then pardon_unit(unit) end


Suggested change

if unit then pardon_unit(unit) end

pardon_unit(unit)

we still need this check because unit can still be nil if a unit wasn't found by either of the methods

if a unit was not found in either of the if branches above, then qerror will throw

myk002 · 2024-06-22T01:13:12Z

justice.lua

+end
+
+qerror(("Unrecognised command: %s"):format(command))


Suggested change

end

qerror(("Unrecognised command: %s"):format(command))

elseif not command then

qerror('missing command')

else

qerror(("Unrecognised command: %s"):format(command))

end

myk002

please also add a line to the changelog under New tools

master-spike · 2024-10-28T02:02:39Z

pre-commit.ci autofix

…ected unit

myk002 · 2024-11-28T16:44:22Z

justice.lua

+        unit = df.unit.find(unit_id)
+        if not unit then qerror(("No unit with id %i"):format(unit_id)) end
+    end
+    if unit then pardon_unit(unit) end


if a unit was not found in either of the if branches above, then qerror will throw

myk002 · 2024-11-28T16:44:54Z

justice.lua

+        if not unit then qerror("No unit selected!") end
+    else
+        unit = df.unit.find(unit_id)
+        if not unit then qerror(("No unit with id %i"):format(unit_id)) end


Suggested change

if not unit then qerror(("No unit with id %i"):format(unit_id)) end

if not unit then qerror(("No unit with id %d"):format(unit_id)) end

myk002 · 2024-11-28T16:45:45Z

justice.lua

+if command == "pardon" then
+    command_pardon(unit_id)
+elseif not command then
+    qerror('Missing command')


Suggested change

qerror('Missing command')

print(dfhack.script_help())

myk002 · 2024-11-28T17:10:08Z

github doesn't seem to be able to merge this for some reason, so I'll do some git magic in #1341

resolve merge conflicts for #1200

master-spike force-pushed the commute_sentence branch from e16f1cb to f43f816 Compare June 20, 2024 23:03

master-spike force-pushed the commute_sentence branch 3 times, most recently from d1081ea to 7b85a77 Compare June 21, 2024 22:24

myk002 reviewed Jun 22, 2024

View reviewed changes

myk002 reviewed Jun 24, 2024

View reviewed changes

master-spike force-pushed the commute_sentence branch from 7b85a77 to 987397e Compare October 28, 2024 00:28

master-spike force-pushed the commute_sentence branch from 62739f7 to 474fde5 Compare October 28, 2024 02:05

master-spike force-pushed the commute_sentence branch from 474fde5 to fe1612e Compare November 11, 2024 18:08

master-spike added 4 commits November 12, 2024 15:07

added script commute-sentence to commute the prison sentence of a sel…

782ea3d

…ected unit

changed commute-sentence to justice with command option pardon

613c3ec

justice - line added to changelog for introduction of this script

622b711

justice: implement code review suggestions

7d7baca

master-spike force-pushed the commute_sentence branch from fe1612e to 7d7baca Compare November 12, 2024 15:09

master-spike requested a review from myk002 November 22, 2024 18:08

myk002 approved these changes Nov 28, 2024

View reviewed changes

myk002 mentioned this pull request Nov 28, 2024

resolve merge conflicts for #1200 #1341

Merged

myk002 added a commit that referenced this pull request Nov 28, 2024

Merge pull request #1341 from DFHack/myk_justice

760b1c5

resolve merge conflicts for #1200

myk002 merged commit dbce375 into DFHack:master Nov 28, 2024
10 checks passed

	:summary: Commands related to the justice system
	:summary: Commands related to the justice system.

	Pardon the selected unit or the one specified by unit id if provided. Currently
	Pardon the selected unit or the one specified by unit id (if provided). Currently

		only applies to prison time and doesn't cancel beatings or hammerings.


		options

	if not unit then qerror(("No unit with id %i"):format(unit_id)) end
	if not unit then qerror(("No unit with id %d"):format(unit_id)) end

Script to commute the prison sentence of a convicted criminal #1200

Script to commute the prison sentence of a convicted criminal #1200

Uh oh!

Conversation

master-spike commented Jun 20, 2024 • edited by myk002 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

myk002 commented Jun 21, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

myk002 left a comment

Choose a reason for hiding this comment

Uh oh!

master-spike commented Oct 28, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

myk002 commented Nov 28, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

master-spike commented Jun 20, 2024 •

edited by myk002

Loading