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

Autolabor: do not count designations in hidden squares (since your dwarves can't reach them anyway). Also apply an assignment penalty for assigning a dwarf to a labor other than the one the dwarf is doing

develop
Kelly Martin 2012-12-12 10:37:09 -06:00
parent 0fc01c48e1
commit 3b9f21a1ea
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/autolabor.cpp
Unescape Escape View File

@ -1540,6 +1540,9 @@ private:
for (int x = 0; x < 16; x++) for (int x = 0; x < 16; x++)
for (int y = 0; y < 16; y++) for (int y = 0; y < 16; y++)
{ {
if (bl->designation[x][y].bits.hidden)
continue;
df::tile_dig_designation dig = bl->designation[x][y].bits.dig; df::tile_dig_designation dig = bl->designation[x][y].bits.dig;
if (dig != df::enums::tile_dig_designation::No) if (dig != df::enums::tile_dig_designation::No)
{ {
@ -2094,8 +2097,11 @@ public:
score -= 10000; score -= 10000;
if (d->armed && labor_outside[labor]) if (d->armed && labor_outside[labor])
score += 5000; score += 5000;
if (d->state == BUSY && d->using_labor == labor) if (d->state == BUSY)
score += 7500; if (d->using_labor == labor)
score += 7500;
else
score -= 7500;
if (score > best_score) if (score > best_score)
{ {
bestdwarf = k; bestdwarf = k;