Merge pull request DFHack#353 from PatrikLundell/v4702

field matching to XML. updated history_event_reason
PatrikLundell · Feb 16, 2020 · 8b0cc96 · 8b0cc96
2 parents 111d889 + c21af19
commit 8b0cc96
Show file tree

Hide file tree

Showing 2 changed files with 331 additions and 100 deletions.
diff --git a/df.entities.xml b/df.entities.xml
@@ -302,6 +302,30 @@
         <enum-item name='Guild'/>
     </enum-type>
 
+    <struct-type type-name='honors_type' comment='Not seen any military rank requiring specific skill(s) apart from any range or melee'>
+        <int32_t name='index'/>
+        <bool name='granted_to_everybody' comment='guess'/>
+        <int32_t name='unk_v47_1'/>
+        <int32_t name='unk_v47_2'/>
+        <int32_t name='unk_v47_3'/>
+        <int32_t name='unk_v47_4'/>
+        <int32_t name='unk_v47_5'/>
+        <int32_t name='unk_v47_6'/>
+        <int32_t name='unk_v47_7'/>
+        <int32_t name='unk_v47_8'/>
+        <int32_t name='precedence_awarded'/>
+        <int16_t name='required_skill' ref-target='job_skill'/>
+        <int16_t name='unk_v47_9'/>
+        <int32_t name='unk_v47_10'/>
+        <int32_t name='required_xp' comment='guess'/>
+        <int32_t name='unk_v47_11'/>
+        <int32_t name='required_battles'/>
+        <int32_t name='unk_v47_12'/>
+        <int32_t name='unk_v47_13'/>
+        <stl-vector name='honored' type-name='int32_t' ref-target='hfid'/>
+        <stl-vector name='unk_v47_14' type-name='int32_t' comment='Non zero for military ranks. Only seen length of 1. The type is most likely wrong, but leaving it out resulted consistent vector lengths of 0'/>
+    </struct-type>
+
     <struct-type type-name='historical_entity' key-field='id'
                  instance-vector='$global.world.entities.all'>
         <enum name='type' base-type='int16_t' type-name='historical_entity_type'/>
@@ -586,8 +610,8 @@
 
         <stl-vector since='v0.44.01'/>
 
-        <stl-vector since='v0.47.01'/>
-        <int32_t since='v0.47.01' comment='probably a next_id'/>
+        <stl-vector name='honors' pointer-type='honors_type' since='v0.47.01' comment='Only merc companies. Matches #Honors groups in Legends Viewer'/>
+        <int32_t name='next_honors_index' since='v0.47.01'/>
 
         <int32_t since='v0.47.01'/>
         <int32_t since='v0.47.01'/>