Fix a few economy-related things based on info from 23a

DFHack · Aug 18, 2014 · 335756a · 335756a
1 parent 97b8e6a
commit 335756a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/df.buildings.xml b/df.buildings.xml
@@ -921,8 +921,8 @@
     </enum-type>
 
     <class-type type-name='building_shopst' inherits-from='building_actual'>
-        <int32_t name='has_owner'/>
-        <int32_t name='shop_owner' comment='type uncertain - not a unit ID or unit pointer'/>
+        <pointer type-name='unit' name='owner'/>
+        <int32_t name='timer' comment='increments until reaching 200,000,000'/>
         <bitfield name='shop_flags' base-type='int16_t' init-value='1'>
             <flag-bit name='for_sale'/>
         </bitfield>

diff --git a/df.ui.xml b/df.ui.xml
@@ -143,12 +143,12 @@
 
         <compound name='tax_collection'>
             <int16_t name='state'/>
-            <int32_t/>
+            <int32_t name='check_timer'/>
             <stl-vector name='rooms' pointer-type='building'/>
-            <int32_t/>
-            <int32_t comment='probably for tax collector'/>
-            <int32_t comment='probably for guard1'/>
-            <int32_t comment='probably for guard2'/>
+            <int32_t name='reach_room_timer'/>
+            <int32_t name='tc_protect_timer'/>
+            <int32_t name='guard1_reach_tc_timer'/>
+            <int32_t name='guard2_reach_tc_timer'/>
             <int16_t name='collected'/>
             <int16_t name='quota'/>
             <compound type-name='coord' name='collector_pos'/>
@@ -158,7 +158,7 @@
             <pointer type-name='unit' name='collector'/>
             <pointer type-name='unit' name='guard1'/>
             <pointer type-name='unit' name='guard2'/>
-            <int8_t/>
+            <int8_t name='guard_lack_complained'/>
         </compound>
 
         <int32_t/>