Updates

* Add new fields to map_viewport * There's now a map_viewport inside world * Fix building_flags * Add new tree tile types * Fix alignment of material[_template] * Remove plotinfo.unk_v50_1, update and realign plotinfo.main * Realign map_renderer * Realign entity_raw and entity_position_raw * Realign manager_order_template and identify where they get stored * Identify some Steam/Classic differences, which are going to be a pain * Add layouts for some new map event types, currently unknown * Identify new vectors in matgloss_list
DFHack · Jan 5, 2023 · f20bf5d · f20bf5d
1 parent 72610a1
commit f20bf5d
Show file tree

Hide file tree

Showing 10 changed files with 511 additions and 199 deletions.
diff --git a/df.buildings.xml b/df.buildings.xml
@@ -207,10 +207,9 @@
         <flag-bit name='site_blocked' comment='items on ground on site'/>
         <flag-bit name='room_collision' comment='major intersection with another room?'/>
         <flag-bit/>
-        <flag-bit name='justice'/>
         <flag-bit name='almost_deleted' comment='when requesting delete while in_update'/>
-        <flag-bit name='in_update'/>
-        <flag-bit name='from_worldgen'/>
+        <flag-bit name='in_update'/> moved?
+        <flag-bit name='from_worldgen'/> moved?
     </bitfield-type>
 
     <bitfield-type type-name='door_flags' base-type='uint16_t'>

diff --git a/df.entity-raws.xml b/df.entity-raws.xml
@@ -221,15 +221,15 @@
         <stl-string name='translation'/>
 
         <compound name='symbols'>
-            <static-array name='symbols1' type-name='language_word_table' index-enum='entity_name_type' count='18'/>
-            <static-array name='symbols2' type-name='language_word_table' index-enum='entity_name_type' count='18'/>
-            <static-array name='select_symbol' index-enum='entity_name_type' count='18'>
+            <static-array name='symbols1' type-name='language_word_table' index-enum='entity_name_type' count='19'/>
+            <static-array name='symbols2' type-name='language_word_table' index-enum='entity_name_type' count='19'/>
+            <static-array name='select_symbol' index-enum='entity_name_type' count='19'>
                 <stl-vector pointer-type='stl-string'/>
             </static-array>
-            <static-array name='subselect_symbol' index-enum='entity_name_type' count='18'>
+            <static-array name='subselect_symbol' index-enum='entity_name_type' count='19'>
                 <stl-vector pointer-type='stl-string'/>
             </static-array>
-            <static-array name='cull_symbol' index-enum='entity_name_type' count='18'>
+            <static-array name='cull_symbol' index-enum='entity_name_type' count='19'>
                 <stl-vector pointer-type='stl-string'/>
             </static-array>
         </compound>
@@ -326,12 +326,6 @@
             <stl-vector name='permitted_reaction_id' type-name='int32_t' ref-target='reaction'/>
         </compound>
 
-        <compound name='land_holder_trigger'>
-            <static-array name='num' type-name='int32_t' count='10'/>
-            <static-array name='population' type-name='int32_t' count='10'/>
-            <static-array name='wealth' type-name='int32_t' count='10'/>
-        </compound>
-
         <int32_t name='banditry'/>
 
         <stl-vector pointer-type='stl-string' name='gem_shapes_str'/>
@@ -503,6 +497,9 @@
         <int32_t name='required_tomb'/>
         <int32_t name='mandate_max'/>
         <int32_t name='demand_max'/>
+
+        <int32_t/>
+        <stl-string/>
     </struct-type>
 </data-definition>
 

diff --git a/df.jobs.xml b/df.jobs.xml
@@ -467,6 +467,9 @@
         <int32_t name="hist_figure_id" ref-target='historical_figure'/>
         <bitfield name="material_category" type-name='job_material_category'/>
         <int32_t name='unk_1' init-value='1'/>
+        <stl-string/>
+        <stl-string/>
+        <int32_t/>
     </struct-type>
 
     <enum-type type-name='guild_id' base-type='int16_t'>

diff --git a/df.materials.xml b/df.materials.xml
@@ -291,6 +291,11 @@
         </compound>
 
         <stl-vector name='reaction_class' pointer-type='stl-string'/>
+    </struct-type>
+
+    <struct-type type-name='material' inherits-from='material_common' custom-methods='true'>
+        <code-helper name='find-instance'>(material-by-id $ $$)</code-helper>
+        <code-helper name='describe'> (describe-material $) </code-helper>
 
         <uint8_t name='tile'/>
 
@@ -300,24 +305,17 @@
 
         <uint8_t name='item_symbol'/>
 
+        <int32_t/><int32_t/><int32_t/> 0.50.01
+
         <int16_t name='powder_dye'/> // color token index
         <int16_t name='temp_diet_info'/>
 
-        <int32_t/><int32_t/><int32_t/><int32_t/> 0.50.01
-
         <stl-vector name='syndrome' pointer-type='syndrome'/>
 
         <int32_t name='soap_level'/>
 
         <stl-vector name='unk_41c' type-name='int16_t' since='v0.40.01'/>
 
-        <int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/> 0.50.01
-    </struct-type>
-
-    <struct-type type-name='material' inherits-from='material_common' custom-methods='true'>
-        <code-helper name='find-instance'>(material-by-id $ $$)</code-helper>
-        <code-helper name='describe'> (describe-material $) </code-helper>
-
         <stl-string name='prefix'/>
 
         <static-array name='food_mat_index' count='39' index-enum='organic_mat_category'>
@@ -327,6 +325,9 @@
 
         <stl-string name='powder_dye_str' comment='temporary'/>
         <static-array name='state_color_str' type-name='stl-string' count='6' index-enum='matter_state'/>
+
+        <int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/> 0.50.01
+
         <custom-methods>
             <cmethod name='isGem'/>
             <cmethod name='isStone'/>
@@ -343,6 +344,23 @@
     <struct-type type-name='material_template' inherits-from='material_common'>
         <code-helper name='describe'> (describe-material $) </code-helper>
 
+        <uint8_t name='tile'/>
+
+        <static-array name='basic_color' type-name='int16_t' count='2'/>
+        <static-array name='build_color' type-name='int16_t' count='3'/>
+        <static-array name='tile_color' type-name='int16_t' count='3'/>
+
+        <uint8_t name='item_symbol'/>
+
+        <int16_t name='powder_dye'/> // color token index
+        <int16_t name='temp_diet_info'/>
+
+        <stl-vector name='syndrome' pointer-type='syndrome'/>
+
+        <int32_t name='soap_level'/>
+
+        <stl-vector name='unk_41c' type-name='int16_t' since='v0.40.01'/>
+
         <stl-string name='powder_dye_str' comment='temporary'/>
         <static-array name='state_color_str' type-name='stl-string' count='6' index-enum='matter_state'/>
     </struct-type>

diff --git a/df.refs.xml b/df.refs.xml
@@ -546,7 +546,7 @@
                 <pointer name='file' type-name='file_compressorst'/>
                 <enum name='loadversion' type-name='save_version'/>
             </vmethod>
-            <vmethod comment='generate_xml'>
+            <vmethod name='generate_xml'>
                 <pointer type-name='stl-fstream'/>
                 <int32_t name='indent'/>
             </vmethod>
@@ -598,7 +598,7 @@
                 <pointer name='file' type-name='file_compressorst'/>
                 <enum name='loadversion' type-name='save_version'/>
             </vmethod>
-            <vmethod comment='generate_xml'>
+            <vmethod name='generate_xml'>
                 <pointer type-name='stl-fstream'/>
                 <int32_t name='indent'/>
             </vmethod>