Merge pull request DFHack#68 from splintermind/master

identify some occupation fields
splintermind · Dec 18, 2015 · 36f94c0 · 36f94c0
2 parents f3ae4d4 + f300de4
commit 36f94c0
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/df.art.xml b/df.art.xml
@@ -472,14 +472,23 @@
         <int32_t/>
     </struct-type>
 
+    <enum-type type-name='occupation_type' base-type='int32_t'>
+        <enum-item name='TAVERN_KEEPER'/>
+        <enum-item name='PERFORMER'/>
+        <enum-item name='SCHOLAR'/>
+        <enum-item name='MERCENARY'/>
+        <enum-item name='MONSTER_SLAYER'/>
+        <enum-item name='SCRIBE'/>
+    </enum-type>
+
     <struct-type type-name='occupation' instance-vector='$global.world.occupations.all' key-field='id'>
         <int32_t name='id'/>
+        <enum name='type' base-type='int32_t' type-name='occupation_type'/>
+        <int32_t name='histfig_id' ref-target='historical_figure'/>
+        <int32_t name='unit_id' ref-target='unit'/>
         <int32_t/>
         <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <int32_t comment='appears to be an entity_id?'/>
         <stl-vector pointer-type='occupation_sub1'/>
         <int32_t/>
         <int32_t/>