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

Autolabor: add build floor grate labor, add unbuild screwpump labor, protect pump operators, do not clear labors on already busy dwarfs

develop
Kelly Martin 2013-01-22 16:34:51 -06:00
parent 90a62a82f7
commit 675e92f350
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/autolabor.cpp
Unescape Escape View File

@ -810,6 +810,7 @@ private:
case df::building_type::TractionBench: case df::building_type::TractionBench:
case df::building_type::Slab: case df::building_type::Slab:
case df::building_type::Chain: case df::building_type::Chain:
case df::building_type::GrateFloor:
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:
@ -853,6 +854,7 @@ private:
case df::building_type::Construction: case df::building_type::Construction:
case df::building_type::Wagon: case df::building_type::Wagon:
case df::building_type::Bridge: case df::building_type::Bridge:
case df::building_type::ScrewPump:
{ {
df::building_actual* b = (df::building_actual*) bld; df::building_actual* b = (df::building_actual*) bld;
return construction_build_labor(b->contained_items[0]->item); return construction_build_labor(b->contained_items[0]->item);
@ -2178,7 +2180,10 @@ public:
} }
int score = skill_level * 1000 - (d->high_skill - skill_level) * 2000 + (xp / (skill_level + 5) * 10); int score = skill_level * 1000 - (d->high_skill - skill_level) * 2000 + (xp / (skill_level + 5) * 10);
if (d->dwarf->status.labors[labor]) if (d->dwarf->status.labors[labor])
score += 500; if (labor == df::unit_labor::OPERATE_PUMP)
score += 50000;
else
score += 1000;
if (default_labor_infos[labor].tool != TOOL_NONE && if (default_labor_infos[labor].tool != TOOL_NONE &&
d->has_tool[default_labor_infos[labor].tool]) d->has_tool[default_labor_infos[labor].tool])
score += 5000; score += 5000;
@ -2219,7 +2224,7 @@ public:
(*bestdwarf)->dwarf->military.pickup_flags.bits.update = true; (*bestdwarf)->dwarf->military.pickup_flags.bits.update = true;
} }
} }
else else if ((*bestdwarf)->state == IDLE)
(*bestdwarf)->clear_labor(l); (*bestdwarf)->clear_labor(l);
} }