From 866660169e89599141264ec3f03691bd4597dc79 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Sun, 3 May 2020 17:53:32 -0500 Subject: [PATCH 1/3] Update joblabormapper.cpp Add no-labor mappings for new jobs 241 through 243. --- plugins/labormanager/joblabormapper.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/labormanager/joblabormapper.cpp b/plugins/labormanager/joblabormapper.cpp index 7c4f80fb7..7b4e77553 100644 --- a/plugins/labormanager/joblabormapper.cpp +++ b/plugins/labormanager/joblabormapper.cpp @@ -896,6 +896,10 @@ JobLaborMapper::JobLaborMapper() job_to_labor_table[df::job_type::PutItemOnDisplay] = jlf_const(df::unit_labor::HAUL_ITEM); job_to_labor_table[df::job_type::StoreItemInLocation] = jlf_no_labor; // StoreItemInLocation + + job_to_labor_table[df::job_type::unk_fake_no_job] = jlf_no_labor; // added for 47.04 - see #1561 + job_to_labor_table[df::job_type::InterrogateSubject] = jlf_no_labor; // added for 47.04 - see #1561 + job_to_labor_table[df::job_type::unk_fake_no_activity] = jlf_no_labor; // added for 47.04 - see #1561 }; df::unit_labor JobLaborMapper::find_job_labor(df::job* j) From 319354f6cd34ad7a68bbbcc90b3c28948322e063 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Sun, 3 May 2020 18:16:31 -0500 Subject: [PATCH 2/3] Update labormanager.cpp Add entries for jobs 241-243 to the `dwarf_states` vector as well, derp. --- plugins/labormanager/labormanager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index e416dcf63..accb74b38 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -385,6 +385,9 @@ static const dwarf_state dwarf_states[] = { BUSY /* MakeBracelet */, BUSY /* MakeGem */, BUSY /* PutItemOnDisplay */, + BUSY /* unk_fake_no_job */, + BUSY /* InterrogateSubject */, + BUSY /* unk_fake_no_activity */, }; struct labor_info From 2dfd7ea0d0399b603b5461b4fee34c21079bd651 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Sun, 3 May 2020 18:19:49 -0500 Subject: [PATCH 3/3] Update labormanager.cpp again These should probably be OTHER rather than BUSY. --- plugins/labormanager/labormanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index accb74b38..fad421104 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -385,9 +385,9 @@ static const dwarf_state dwarf_states[] = { BUSY /* MakeBracelet */, BUSY /* MakeGem */, BUSY /* PutItemOnDisplay */, - BUSY /* unk_fake_no_job */, - BUSY /* InterrogateSubject */, - BUSY /* unk_fake_no_activity */, + OTHER /* unk_fake_no_job */, + OTHER /* InterrogateSubject */, + OTHER /* unk_fake_no_activity */, }; struct labor_info