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

Add new PutItemOnDisplay job to labor management plugins 

Also add building_type::DisplayFurniture to labormanager

Fixes #1208
develop
lethosor 2017-12-27 13:48:53 -05:00
parent 94e6e89b31
commit e72474613f
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit 24bd450fdabe8be6483ad73f1355c0fd30571b05 Subproject commit 301807985eefb4db88416a0f5a7f7b94aadfb667

3
plugins/autohauler.cpp
Unescape Escape View File

@ -405,7 +405,8 @@ static const dwarf_state dwarf_states[] = {
BUSY /* MakeRing */, BUSY /* MakeRing */,
BUSY /* MakeEarring */, BUSY /* MakeEarring */,
BUSY /* MakeBracelet */, BUSY /* MakeBracelet */,
BUSY /* MakeGem */ BUSY /* MakeGem */,
BUSY /* PutItemOnDisplay */,
}; };
// Mode assigned to labors. Either it's a hauling job, or it's not. // Mode assigned to labors. Either it's a hauling job, or it's not.

3
plugins/autolabor.cpp
Unescape Escape View File

@ -373,7 +373,8 @@ static const dwarf_state dwarf_states[] = {
BUSY /* MakeRing */, BUSY /* MakeRing */,
BUSY /* MakeEarring */, BUSY /* MakeEarring */,
BUSY /* MakeBracelet */, BUSY /* MakeBracelet */,
BUSY /* MakeGem */ BUSY /* MakeGem */,
BUSY /* PutItemOnDisplay */,
}; };
struct labor_info struct labor_info

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

@ -358,6 +358,7 @@ public:
case df::building_type::GrateWall: case df::building_type::GrateWall:
case df::building_type::Bookcase: case df::building_type::Bookcase:
case df::building_type::Instrument: case df::building_type::Instrument:
case df::building_type::DisplayFurniture:
return df::unit_labor::HAUL_FURNITURE; return df::unit_labor::HAUL_FURNITURE;
case df::building_type::Trap: case df::building_type::Trap:
case df::building_type::GearAssembly: case df::building_type::GearAssembly:
@ -463,6 +464,7 @@ public:
case df::building_type::GrateWall: case df::building_type::GrateWall:
case df::building_type::Bookcase: case df::building_type::Bookcase:
case df::building_type::Instrument: case df::building_type::Instrument:
case df::building_type::DisplayFurniture:
return df::unit_labor::HAUL_FURNITURE; return df::unit_labor::HAUL_FURNITURE;
case df::building_type::AnimalTrap: case df::building_type::AnimalTrap:
return df::unit_labor::TRAPPER; return df::unit_labor::TRAPPER;
@ -882,6 +884,7 @@ JobLaborMapper::JobLaborMapper()
job_to_labor_table[df::job_type::MakeEarring] = jlf_make_object; job_to_labor_table[df::job_type::MakeEarring] = jlf_make_object;
job_to_labor_table[df::job_type::MakeBracelet] = jlf_make_object; job_to_labor_table[df::job_type::MakeBracelet] = jlf_make_object;
job_to_labor_table[df::job_type::MakeGem] = jlf_make_object; job_to_labor_table[df::job_type::MakeGem] = jlf_make_object;
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
}; };
@ -917,4 +920,4 @@ df::unit_labor JobLaborMapper::find_job_labor(df::job* j)
return labor; return labor;
} }
/* End of labor deducer */ /* End of labor deducer */

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

@ -377,7 +377,8 @@ static const dwarf_state dwarf_states[] = {
BUSY /* MakeRing */, BUSY /* MakeRing */,
BUSY /* MakeEarring */, BUSY /* MakeEarring */,
BUSY /* MakeBracelet */, BUSY /* MakeBracelet */,
BUSY /* MakeGem */ BUSY /* MakeGem */,
BUSY /* PutItemOnDisplay */,
}; };
struct labor_info struct labor_info