From 50ce9942f443c4a51d65f31edf5d9984a1ece718 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 8 Dec 2016 16:01:14 -0600 Subject: [PATCH 1/2] labormanager: add deconstruct labor for constructed instruments (#7) --- plugins/labormanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/labormanager.cpp b/plugins/labormanager.cpp index bb971ebd2..fed0b1abe 100644 --- a/plugins/labormanager.cpp +++ b/plugins/labormanager.cpp @@ -961,6 +961,7 @@ private: case df::building_type::GrateFloor: case df::building_type::GrateWall: case df::building_type::Bookcase: + case df::building_type::Instrument: return df::unit_labor::HAUL_FURNITURE; case df::building_type::AnimalTrap: return df::unit_labor::TRAPPER; From 1a9d8629c555ea2cdfb48468561f90b98bd0f938 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 9 Dec 2016 09:54:20 -0600 Subject: [PATCH 2/2] labormanager: fix StoreItemInVehicle labor inference (#8) * labormanager: add deconstruct labor for constructed instruments * labormanager: fix StoreItemInVehicle labor inference StoreItemInVehicle requires the labor appropriate to the item being stashed --- plugins/labormanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/labormanager.cpp b/plugins/labormanager.cpp index fed0b1abe..94a22acb3 100644 --- a/plugins/labormanager.cpp +++ b/plugins/labormanager.cpp @@ -1375,7 +1375,7 @@ public: job_to_labor_table[df::job_type::CarveTrack] = jlf_const(df::unit_labor::DETAIL); job_to_labor_table[df::job_type::PushTrackVehicle] = jlf_const(df::unit_labor::HANDLE_VEHICLES); job_to_labor_table[df::job_type::PlaceTrackVehicle] = jlf_const(df::unit_labor::HANDLE_VEHICLES); - job_to_labor_table[df::job_type::StoreItemInVehicle] = jlf_const(df::unit_labor::HANDLE_VEHICLES); + job_to_labor_table[df::job_type::StoreItemInVehicle] = jlf_hauling; job_to_labor_table[df::job_type::GeldAnimal] = jlf_const(df::unit_labor::GELD); job_to_labor_table[df::job_type::MakeFigurine] = jlf_make_object; job_to_labor_table[df::job_type::MakeAmulet] = jlf_make_object;