Realign entity+raw

DFHack · Jan 26, 2023 · 7050d23 · 7050d23
1 parent 8b4564b
commit 7050d23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/df.entities.xml b/df.entities.xml
@@ -763,7 +763,7 @@
             <stl-vector name='gloves_over' type-name='int16_t' ref-target='itemdef_glovesst'/>
             <stl-vector name='gloves_cover' type-name='int16_t' ref-target='itemdef_glovesst'/>
         </compound>
-        <static-array name='assignments_by_type' count='42'
+        <static-array name='assignments_by_type' count='43'
                       index-enum='entity_position_responsibility'>
             <stl-vector pointer-type='entity_position_assignment'/>
         </static-array>
@@ -780,13 +780,12 @@
                     comment='includes self'/>
 
         <compound name='unknown2'>
-            <!-- <int32_t name='metal_proficiency'
-                comment='best IMPACT_FRACTURE/10000 + MAX_EDGE/1000 for weapon mats plus best IMPACT_FRACTURE/10000 for armor mats'/> -->
+            <int32_t name='metal_proficiency'
+                comment='best IMPACT_FRACTURE/10000 + MAX_EDGE/1000 for weapon mats plus best IMPACT_FRACTURE/10000 for armor mats'/>
             <stl-vector name='weapon_proficiencies' type-name='job_skill'/>
 
             <pointer name='resource_allotment' type-name='resource_allotment_data' comment="Only for SiteGovernment, but not all"/>
             <stl-vector name='unk_1' since='v0.42.01' pointer-type='poetic_form'/>
-            <int32_t comment='this may be metal_proficiency'/>
             <stl-vector name='unk_2' since='v0.42.01' pointer-type='musical_form'/>
             <stl-vector name='unk_3' since='v0.42.01' pointer-type='dance_form'/>
             <stl-vector name='unk_4' since='v0.42.01' pointer-type='written_content'/>
@@ -797,11 +796,6 @@
             <pointer name='region' type-name='world_region' has-bad-pointers='true'/>  -- Civ entities. Non pointers for sites.
             <int32_t name='unk16' comment='uninitialized'/>
             <int16_t name='unk17' comment='0'/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
 
             <stl-vector name='unk18' type-name='int32_t' comment='used during world gen'/>
             <stl-vector name='unk19' type-name='int16_t' comment='used during world gen'/>
@@ -959,7 +953,8 @@
         <stl-vector name='appointed_by_civ' type-name='int32_t' ref-target='historical_entity'/>
         <stl-vector name='succession_by_position' type-name='int32_t'/>
 
-        <static-array type-name='bool' name='responsibilities' count='42' index-enum='entity_position_responsibility'/>
+        <static-array type-name='bool' name='responsibilities' count='43' index-enum='entity_position_responsibility'/>
+        <stl-string name='unk_v50_358'/>
         <static-array type-name='int16_t' name='color' count='3'/>
 
         <int32_t name='required_boxes'/>

diff --git a/df.entity-raws.xml b/df.entity-raws.xml
@@ -305,10 +305,10 @@
         <stl-vector name='positions' pointer-type='entity_position_raw'/>
 
         <static-array name='variable_positions' type-name='int8_t'
-                      index-enum='entity_position_responsibility' count='42'/>
+                      index-enum='entity_position_responsibility' count='43'/>
 
         <static-array name='site_variable_positions' type-name='int8_t'
-                      index-enum='entity_position_responsibility' count='42'/>
+                      index-enum='entity_position_responsibility' count='43'/>
 
         <stl-vector name='tissue_styles'>
             <pointer>
@@ -435,6 +435,7 @@
         <enum-item name='MAINTAIN_ROADS'/>
         <enum-item name='MAINTAIN_BRIDGES'/>
         <enum-item name='MAINTAIN_TUNNELS'/>
+        <enum-item name='DELIVER_MESSAGES'/>
     </enum-type>
 
     <struct-type type-name='entity_position_raw'>
@@ -484,7 +485,7 @@
         <stl-vector name='succession_by_position_str' pointer-type='stl-string'/>
         <stl-vector name='succession_by_position' type-name='int32_t'/>
 
-        <static-array type-name='bool' name='responsibilities' count='42' index-enum='entity_position_responsibility'/>
+        <static-array type-name='bool' name='responsibilities' count='43' index-enum='entity_position_responsibility'/>
         <static-array type-name='int16_t' name='color' count='3'/>
 
         <int32_t name='required_boxes'/>