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

Fix some blatant bugs in somebody else's additions to showmood

develop
Quietust 2014-08-21 15:23:05 -05:00
parent 33f4f9fdcb
commit eb221e1165
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/showmood.cpp
Unescape Escape View File

@ -166,17 +166,6 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
out.print("not yet claimed a workshop but will want"); out.print("not yet claimed a workshop but will want");
out.print(" the following items:\n"); out.print(" the following items:\n");
// total amount of stuff fetched so far
int count_got = 0;
for (size_t i = 0; i < job->items.size(); i++)
{
df::item_type type = job->job_items[i]->item_type;
if (type == item_type::BAR || type == item_type::CLOTH)
count_got += job->items[i]->item->getTotalDimension();
else
count_got += 1;
}
for (size_t i = 0; i < job->job_items.size(); i++) for (size_t i = 0; i < job->job_items.size(); i++)
{ {
df::job_item *item = job->job_items[i]; df::job_item *item = job->job_items[i];
@ -279,13 +268,21 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
} }
} }
// total amount of stuff fetched for this requirement // count how many items of this type the crafter already collected
// XXX may fail with cloth/thread/bars if need 1 and fetch 2 {
int got = count_got; int count_got = 0;
if (got > item->quantity) for (size_t j = 0; j < job->items.size(); j++)
got = item->quantity; {
out.print(", quantity %i (got %i)\n", item->quantity, got); if(job->items[j]->job_item_idx == i)
count_got -= got; {
if (item->item_type == item_type::BAR || item->item_type == item_type::CLOTH)
count_got += job->items[j]->item->getTotalDimension();
else
count_got += 1;
}
}
out.print(", quantity %i (got %i)\n", item->quantity, count_got);
}
} }
} }
if (!found) if (!found)