Figure out more job-related ui objects.

DFHack · Jan 2, 2012 · 7b89e59 · 7b89e59
1 parent 4499a8c
commit 7b89e59
Show file tree

Hide file tree

Showing 12 changed files with 674 additions and 389 deletions.
diff --git a/df.buildings.xml b/df.buildings.xml
@@ -164,7 +164,7 @@
         <int32_t name="min_level"/>
         <int32_t name="max_level"/>
 
-        <int32_t name="custom_type" refers-to='$global.world.raws.buildings.furnaces[$]'/>
+        <int32_t name="custom_type" ref-target='building_def'/>
     </class-type>
 
     <enum-type type-name='workshop_type'>
@@ -206,7 +206,7 @@
         <int32_t name="machine_id" ref-target='machine'/>
         <int32_t name="unk_118"/>
 
-        <int32_t name="custom_type" refers-to='$global.world.raws.buildings.workshops[$]'/>
+        <int32_t name="custom_type" ref-target='building_def'/>
     </class-type>
 
     -- misc --

diff --git a/df.job-enums.xml b/df.job-enums.xml
@@ -2144,11 +2144,11 @@
         <enum-item name='PerformCustomReaction'>
             <item-attr name='caption' value='Perform Custom Reaction'/>
         </enum-item>
-        <enum-item name='Unknown214'>
-            <item-attr name='caption' value='Unknown Job'/>
+        <enum-item name='ConstructSlab'>
+            <item-attr name='caption' value='Construct Slab'/>
         </enum-item>
-        <enum-item name='Unknown215'>
-            <item-attr name='caption' value='Unknown Job'/>
+        <enum-item name='EngraveSlab'>
+            <item-attr name='caption' value='Engrave Memorial Slab'/>
         </enum-item>
         <enum-item name='ShearCreature'>
             <item-attr name='caption' value='Shear Creature'/>

diff --git a/df.jobs.xml b/df.jobs.xml
@@ -62,7 +62,7 @@
         <int16_t name='item_subtype'/>
 
         <compound name="item_category" type-name='job_item_category'/>
-        <int32_t name='unk8'/>
+        <int32_t name="hist_figure_id" ref-target='historical_figure'/>
         <compound name='material_category' type-name='job_material_category'/>
 
         <stl-string name='reaction_name'/>
@@ -220,7 +220,7 @@
         <int32_t name="mat_index"/>
 
         <compound name="item_category" type-name='job_item_category'/>
-        <int32_t name="unk_18"/>
+        <int32_t name="hist_figure_id" ref-target='historical_figure'/>
         <compound name="material_category" type-name='job_material_category'/>
 
         <int16_t name="amount_left"/>

diff --git a/df.raws.xml b/df.raws.xml
@@ -214,13 +214,13 @@
                 <pointer type-name='building_def'/>
             </stl-vector>
             <stl-vector name='workshops'>
-                <pointer type-name='building_def'/>
+                <pointer type-name='building_def_workshopst'/>
             </stl-vector>
             <stl-vector name='furnaces'>
-                <pointer type-name='building_def'/>
+                <pointer type-name='building_def_furnacest'/>
             </stl-vector>
 
-            <int32_t name='unk3'/>
+            <int32_t name='next_id'/>
         </compound>
 
         -- Material index