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

labormanager: multimaterial constructions

develop
nocico 2016-11-29 04:24:25 +02:00 committed by Kelly Kinkade
parent d626990ac8
commit 5c16b5a2b7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/labormanager.cpp
Unescape Escape View File

@ -672,8 +672,15 @@ static df::building* get_building_from_job(df::job* j)
return 0; return 0;
} }
static df::unit_labor construction_build_labor (df::item* i) static df::unit_labor construction_build_labor (df::building_actual* b)
{ {
if (b->getType() == df::building_type::RoadPaved)
return df::unit_labor::BUILD_ROAD;
auto a = (df::building_actual *) b;
// For screw pumps contained_items[0] = pipe, 1 corkscrew, 2 block
// For wells 0 mechanism, 1 rope, 2 bucket, 3 block
// Trade depots and bridges use the last one too
df::item* i = a->contained_items.back()->item;
MaterialInfo matinfo; MaterialInfo matinfo;
if (i && matinfo.decode(i)) if (i && matinfo.decode(i))
{ {
@ -812,7 +819,7 @@ private:
df::building_actual* b = (df::building_actual*) bld; df::building_actual* b = (df::building_actual*) bld;
if (b->design && !b->design->flags.bits.designed) if (b->design && !b->design->flags.bits.designed)
return df::unit_labor::ARCHITECT; return df::unit_labor::ARCHITECT;
return construction_build_labor(j->items[0]->item); return construction_build_labor(b);
} }
break; break;
case df::building_type::FarmPlot: case df::building_type::FarmPlot:
@ -910,8 +917,8 @@ private:
case df::building_type::Well: case df::building_type::Well:
case df::building_type::Windmill: case df::building_type::Windmill:
{ {
df::building_actual* b = (df::building_actual*) bld; auto b = (df::building_actual*) bld;
return construction_build_labor(b->contained_items[0]->item); return construction_build_labor(b);
} }
break; break;
case df::building_type::FarmPlot: case df::building_type::FarmPlot: