Fix handling of Collect Webs jobs in workflow.

2012-10-26 23:53:18 +04:00 · 2012-10-26 23:53:18 +04:00 · 4c2c6a1911
parent c5d8bd9db6
commit 4c2c6a1911
3 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@ -19,6 +19,7 @@ DFHack future
  Workflow plugin:
    - properly considers minecarts assigned to routes busy.
    - code for deducing job outputs rewritten in lua for flexibility.
+    - logic fix: collecting webs produces silk, and ungathered webs are not thread.

 DFHack v0.34.11-r2

--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit ee38c5446e527edcdc9d8c3e23a4ae138d213546
+Subproject commit 4a6903dc9b8d4cd21c5c5d74df4e9f74a4dd58dd
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@ -1055,6 +1055,8 @@ static void map_job_items(color_ostream &out)
            break;

        case item_type::THREAD:
+            if (item->flags.bits.spider_web)
+                continue;
            if (item->getTotalDimension() < 15000)
                is_invalid = true;
            break;