MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ab9rf/lm-1561' into develop

develop
lethosor 2020-05-03 22:50:12 -04:00
parent 2762f75d69 2dfd7ea0d0
commit 42734fc6aa
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/labormanager/joblabormapper.cpp
Unescape Escape View File

@ -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::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::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) df::unit_labor JobLaborMapper::find_job_labor(df::job* j)

3
plugins/labormanager/labormanager.cpp
Unescape Escape View File

@ -385,6 +385,9 @@ static const dwarf_state dwarf_states[] = {
BUSY /* MakeBracelet */, BUSY /* MakeBracelet */,
BUSY /* MakeGem */, BUSY /* MakeGem */,
BUSY /* PutItemOnDisplay */, BUSY /* PutItemOnDisplay */,
OTHER /* unk_fake_no_job */,
OTHER /* InterrogateSubject */,
OTHER /* unk_fake_no_activity */,
}; };
struct labor_info struct labor_info