Update entity, histfig, artifact, unit, and loadgame_save_info

Also, unit_soul uses its own unique ID, not unit_id
PatrikLundell · Nov 25, 2017 · 1faea3c · 1faea3c
1 parent 312e98d
commit 1faea3c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/df.entities.xml b/df.entities.xml
@@ -532,9 +532,9 @@
                     <int32_t/>
                 </pointer>
             </stl-vector>
+            <stl-vector since='v0.44.01'/>
 
             <int16_t name='unk33'/>
-
             <stl-vector name='unk34a' type-name='int16_t'/>
             <stl-vector name='unk34b' type-name='int16_t'/>
             <stl-vector name='unk34c' type-name='int32_t'/>
@@ -571,7 +571,7 @@
             <int32_t name='unk42'/>
             <stl-vector name='unk43' type-name='int32_t' comment='empty'/>
             <int32_t name='unk44'/>
-            <int32_t name='unk44a' since='v0.34.01'/>
+            <int32_t name='unk44a' since='v0.34.01' comment='appears to be a class with a constructor?'/>
             <static-array name='unk44b' count='15' type-name='int32_t' since='v0.34.01'/>
         </compound>
 
@@ -601,6 +601,7 @@
         <pointer name='occasion_info' type-name='entity_occasion_info'/>
 
         <stl-vector name='meeting_events' pointer-type='meeting_event'/>
+        <stl-vector since='v0.44.01'/>
         <pointer name='activity_stats' type-name='entity_activity_statistics'/>
 
         <compound name='unknown1e'>

diff --git a/df.history.xml b/df.history.xml
@@ -400,6 +400,7 @@
 
         <int32_t name='breed_id' comment='from legends export'/>
         <int32_t name='cultural_identity' ref-target='cultural_identity' since='v0.40.1'/>
+        <int32_t since='v0.44.01'/>
 
         <df-flagarray name='flags' index-enum='histfig_flags'/>
 

diff --git a/df.legends.xml b/df.legends.xml
@@ -102,6 +102,22 @@
         <int32_t since='v0.34.01'/>
         <int32_t since='v0.34.01'/>
         <int32_t since='v0.34.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <stl-vector type-name='int32_t' since='v0.44.01'/>
+        <stl-vector type-name='int32_t' since='v0.44.01'/>
+        <stl-vector type-name='int32_t' since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t since='v0.44.01'/>
+        <int32_t comment='unused?'/>
     </struct-type>
 </data-definition>
 

diff --git a/df.units.xml b/df.units.xml
@@ -887,6 +887,7 @@
             <stl-vector name='complaints' pointer-type='unit_complaint'/>
             <stl-vector name='requests' pointer-type='unit_request'/>
             <stl-vector name='coin_debts' pointer-type='unit_coin_debt'/>
+            <stl-vector since='v0.44.01'/>
 
             <int16_t name='adv_sleep_timer'/>
 
@@ -1605,7 +1606,7 @@
     </bitfield-type>
 
     <struct-type type-name='unit_soul'>
-        <int32_t name='unit_id' ref-target='unit'/>
+        <int32_t name='id'/>
 
         <compound name='name' type-name='language_name'/>
 

diff --git a/df.viewscreen.xml b/df.viewscreen.xml
@@ -1481,7 +1481,7 @@
     </class-type>
 
     <struct-type type-name='loadgame_save_info'>
-        <static-array name='save_info' type-name='int32_t' count='38' comment='all of the next_id globals'/>
+        <static-array name='save_info' type-name='int32_t' count='39' comment='all of the next_id globals'/>
         <enum base-type='int16_t' name='game_type' type-name='game_type' comment='only 0 (fort) 1 (adv) 3(reclaim) are valid'/>
         <stl-string name='fort_name'/>
         <stl-string name='world_name'/>