diff --git a/plugins/ruby/ruby.rb b/plugins/ruby/ruby.rb index eda6ffd52..5ae63ebfe 100644 --- a/plugins/ruby/ruby.rb +++ b/plugins/ruby/ruby.rb @@ -66,7 +66,7 @@ module DFHack if onext = @onupdate_list.sort.first DFHack.onupdate_minyear = onext.minyear DFHack.onupdate_minyeartick = onext.minyeartick - end + end @onupdate_list.last end diff --git a/plugins/showmood.cpp b/plugins/showmood.cpp index 7926e2ac5..10d7b52c2 100644 --- a/plugins/showmood.cpp +++ b/plugins/showmood.cpp @@ -165,6 +165,8 @@ command_result df_showmood (color_ostream &out, vector & parameters) out.print("not yet claimed a workshop but will want"); out.print(" the following items:\n"); + int count_got = job->items.size(), got; + for (size_t i = 0; i < job->job_items.size(); i++) { df::job_item *item = job->job_items[i]; @@ -267,7 +269,11 @@ command_result df_showmood (color_ostream &out, vector & parameters) } } - out.print(", quantity %i\n", item->quantity); + got = count_got; + if (got > item->quantity) + got = item->quantity; + out.print(", quantity %i (got %i)\n", item->quantity, got); + count_got -= got; } } if (!found)