Add a bitfield and some enum attr values for use in workflow.

DFHack · Jan 10, 2012 · 9799fc7 · 9799fc7
1 parent 97801c4
commit 9799fc7
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/df.job-types.xml b/df.job-types.xml
@@ -26,7 +26,7 @@
         <enum-attr name='labor' type-name='unit_labor' default-value='NONE'/>
         <enum-attr name='item' type-name='item_type' default-value='NONE'/>
         <enum-attr name='possible_item' type-name='item_type' is-list='true'/>
-        <enum-attr name='possible_material' is-list='true'/>
+        <enum-attr name='material'/>
         <enum-attr name='skill' type-name='job_skill' default-value='NONE'/>
         <enum-attr name='skill_stone' type-name='job_skill' default-value='NONE'/>
         <enum-attr name='skill_wood' type-name='job_skill' default-value='NONE'/>
@@ -150,6 +150,7 @@
             <item-attr name='type' value='Gathering'/>
             <item-attr name='labor' value='HAUL_ITEM'/>
             <item-attr name='item' value='POWDER_MISC'/>
+            <item-attr name='material' value='sand'/>
         </enum-item>
         <enum-item name='Fish'>
             <item-attr name='caption' value='Fish'/>
@@ -850,7 +851,7 @@
             <item-attr name='caption' value='Extract from Plants'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='possible_item' value='LIQUID_MISC'/>
-            <item-attr name='skill' value='HERBALISM'/>
+            <item-attr name='skill' value='BREWING'/>
         </enum-item>
         <enum-item name='ExtractFromRawFish'>
             <item-attr name='caption' value='Extract from Raw Fish'/>
@@ -1024,24 +1025,28 @@
             <item-attr name='caption' value='Make Charcoal'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='BAR'/>
+            <item-attr name='material' value='COAL'/>
             <item-attr name='skill' value='WOOD_BURNING'/>
         </enum-item>
         <enum-item name='MakeAsh'>
             <item-attr name='caption' value='Make Ash'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='BAR'/>
+            <item-attr name='material' value='ASH'/>
             <item-attr name='skill' value='WOOD_BURNING'/>
         </enum-item>
         <enum-item name='MakeLye'>
             <item-attr name='caption' value='Make Lye'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='LIQUID_MISC'/>
+            <item-attr name='material' value='LYE'/>
             <item-attr name='skill' value='LYE_MAKING'/>
         </enum-item>
         <enum-item name='MakePotashFromLye'>
             <item-attr name='caption' value='Make Potash From Lye'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='BAR'/>
+            <item-attr name='material' value='POTASH'/>
             <item-attr name='skill' value='POTASH_MAKING'/>
         </enum-item>
 
@@ -1054,6 +1059,7 @@
             <item-attr name='caption' value='Make Potash From Ash'/>
             <item-attr name='type' value='Manufacture'/>
             <item-attr name='item' value='BAR'/>
+            <item-attr name='material' value='POTASH'/>
             <item-attr name='skill' value='POTASH_MAKING'/>
         </enum-item>
         <enum-item name='DyeThread'>
@@ -1203,6 +1209,7 @@
             <item-attr name='caption' value='Collect Clay'/>
             <item-attr name='type' value='Gathering'/>
             <item-attr name='item' value='BOULDER'/>
+            <item-attr name='material' value='clay'/>
         </enum-item>
         <enum-item name='InstallColonyInHive'>
             <item-attr name='caption' value='Install Colony In Hive'/>

diff --git a/df.jobs.xml b/df.jobs.xml
@@ -15,6 +15,33 @@
         <flag-bit name='yarn'/>
     </bitfield-type>
 
+    <bitfield-type type-name='dfhack_material_category' base-type='uint32_t'>
+        <comment>
+            An extended version of job_material_category,
+            for use in some plugins, like workflow.
+        </comment>
+        <!-- The start must be identical to job_material_category -->
+        <flag-bit name='plant'/>
+        <flag-bit name='wood'/>
+        <flag-bit name='cloth'/>
+        <flag-bit name='silk'/>
+        <flag-bit name='leather'/>
+        <flag-bit name='bone'/>
+        <flag-bit name='shell'/>
+        <flag-bit name='wood2'/>
+        <flag-bit name='soap'/>
+        <flag-bit name='tooth'/>
+        <flag-bit name='horn'/>
+        <flag-bit name='pearl'/>
+        <flag-bit name='yarn'/>
+        <!-- DFHack-specific fields -->
+        <flag-bit name='metal'/>
+        <flag-bit name='stone'/>
+        <flag-bit name='sand'/>
+        <flag-bit name='glass'/>
+        <flag-bit name='clay'/>
+    </bitfield-type>
+
     <bitfield-type type-name='job_item_category' base-type='uint32_t'>
         <flag-bit name='unk1'/>
         <flag-bit name='unk2'/>