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

further tweak building construction labor identification 

It's always more complicated than you expect....
develop
Kelly Kinkade 2016-12-01 14:36:46 -06:00
parent 1d97638579
commit ad6d6fbaa6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/labormanager.cpp
Unescape Escape View File

@ -676,7 +676,7 @@ static df::unit_labor construction_build_labor (df::building_actual* b)
{ {
if (b->getType() == df::building_type::RoadPaved) if (b->getType() == df::building_type::RoadPaved)
return df::unit_labor::BUILD_ROAD; return df::unit_labor::BUILD_ROAD;
// Find last item in building with use mode 2 // Find last item in building with use mode appropriate to the building's constructions state
// For screw pumps contained_items[0] = pipe, 1 corkscrew, 2 block // For screw pumps contained_items[0] = pipe, 1 corkscrew, 2 block
// For wells 0 mechanism, 1 rope, 2 bucket, 3 block // For wells 0 mechanism, 1 rope, 2 bucket, 3 block
// Trade depots and bridges use the last one too // Trade depots and bridges use the last one too
@ -684,7 +684,8 @@ static df::unit_labor construction_build_labor (df::building_actual* b)
df::item* i = 0; df::item* i = 0;
for (auto p = b->contained_items.begin(); p != b->contained_items.end(); p++) for (auto p = b->contained_items.begin(); p != b->contained_items.end(); p++)
if ((*p)->use_mode == 2) if (b->construction_stage > 0 && (*p)->use_mode == 2 ||
b->construction_stage == 0 && (*p)->use_mode == 0)
i = (*p)->item; i = (*p)->item;
MaterialInfo matinfo; MaterialInfo matinfo;