From d1919933767f68b8da11ad57954ef621a6ed997c Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Tue, 15 Nov 2022 13:13:33 -0600 Subject: [PATCH 1/2] autolabor/autohauler: add labor entries for 241-243 add missing entries for jobs 241, 242, and 243 this was fixed in labormanager in PR #1566 (see #1561) but was never addressed in autolabor or autohauler should close #1994 --- plugins/autohauler.cpp | 3 +++ plugins/autolabor.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/plugins/autohauler.cpp b/plugins/autohauler.cpp index b52e9cfb5..5b6d573a6 100644 --- a/plugins/autohauler.cpp +++ b/plugins/autohauler.cpp @@ -407,6 +407,9 @@ static const dwarf_state dwarf_states[] = { BUSY /* MakeBracelet */, BUSY /* MakeGem */, BUSY /* PutItemOnDisplay */, + OTHER /* unk_fake_no_job */, + OTHER /* InterrogateSubject */, + OTHER /* unk_fake_no_activity */, }; // Mode assigned to labors. Either it's a hauling job, or it's not. diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp index 15c6903b4..97bd11a11 100644 --- a/plugins/autolabor.cpp +++ b/plugins/autolabor.cpp @@ -375,6 +375,9 @@ static const dwarf_state dwarf_states[] = { BUSY /* MakeBracelet */, BUSY /* MakeGem */, BUSY /* PutItemOnDisplay */, + OTHER /* unk_fake_no_job */, + OTHER /* InterrogateSubject */, + OTHER /* unk_fake_no_activity */, }; struct labor_info From eeee75273346681cda77c51231d87481ecffb956 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Tue, 15 Nov 2022 13:21:45 -0600 Subject: [PATCH 2/2] Update changelog.txt add changelog --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 2839d9c74..995aceaa6 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `mousequery`: fix the cursor jumping up z levels sometimes when using TWBT - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile - `automaterial`: fix rendering errors with box boundary markers +- `autolabor` & `autohauler`: properly handle jobs 241, 242, and 243 - Core: fix the segmentation fault with the REPORT event in EventManager - Core: fix the new JOB_STARTED event only sending each event once, to the first handler listed