Fields involved in operation of beehive buildings.

angavrilov · Aug 22, 2013 · 250dc7f · 250dc7f
1 parent 1331e95
commit 250dc7f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/df.buildings.xml b/df.buildings.xml
@@ -913,16 +913,18 @@
         <int16_t name='close_timer'/>
     </class-type>
 
+    <bitfield-type type-name='hive_flags' base-type='uint32_t'>
+        <flag-bit name='do_install'/>
+        <flag-bit name='do_gather'/>
+        <flag-bit name='ready_split'/>
+    </bitfield-type>
+
     <class-type type-name='building_hivest' inherits-from='building_actual'>
-        <bitfield name='flags' base-type='int32_t' init-value='3'>
-            <flag-bit name='do_install'/>
-            <flag-bit name='do_gather'/>
-            <flag-bit name='ready_split'/>
-        </bitfield>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <compound name='hive_flags' type-name='hive_flags'/>
+        <int32_t name='split_timer' comment='up to 100800'/>
+        <int32_t name='activity_timer' comment='up to 100800000; checks timer%hive_product.time[i]==0'/>
+        <int32_t name='install_timer' comment='down from 1200'/>
+        <int32_t name='gather_timer' comment='down from 1200'/>
     </class-type>
 
     <class-type type-name='building_nestst' inherits-from='building_actual'/>

diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -1090,18 +1090,22 @@
                     comment='for color modifiers, == number of items in their pattern_* vectors'
                     index-refers-to='$$._parent.modifier_class[$].refers-to'/>
 
-        <stl-vector type-name='int32_t' name='hive_product_0'/>
-        <stl-vector type-name='int32_t' name='hive_product_1'/>
-        <stl-vector type-name='int16_t' name='hive_product_2'/>
-        <stl-vector type-name='int16_t' name='hive_product_3'/>
-        <stl-vector type-name='int16_t' name='hive_product_4'/>
-        <stl-vector type-name='int32_t' name='hive_product_5'/>
-
-        <static-array name='hive_product_tmpstr' count='5'>
-            <stl-vector>
-                <pointer type-name='stl-string'/>
+        <compound name='hive_product'>
+            <stl-vector type-name='int32_t' name='number'/>
+            <stl-vector type-name='int32_t' name='time'/>
+
+            <stl-vector name='item_type'>
+                <enum base-type='int16_t' type-name='item_type'/>
             </stl-vector>
-        </static-array>
+            <stl-vector type-name='int16_t' name='item_subtype'/>
+            <compound name='material' type-name='material_vec_ref'/>
+
+            <static-array name='tmpstr' count='5'>
+                <stl-vector>
+                    <pointer type-name='stl-string'/>
+                </stl-vector>
+            </static-array>
+        </compound>
 
         <int32_t name='next_modifier_id'/>