Merge pull request #842 from quietust/v52.03

Update structures for 52.03

Author: ab9rf

df.army.xml

@@ -89,6 +89,8 @@
         <int32_t name='mat_index'/>
 
         <stl-vector name='items' pointer-type='item' since='v0.44.07'/>
+
+        <size_t name='pool_id'/>
     </struct-type>
 
     <struct-type type-name='army_handlerst'>

df.army_controller.xml

@@ -444,6 +444,8 @@
             <pointer type-name='army_controller_goal_infiltrate_societyst' name='goal_infiltrate_society'/>
         </compound>
         <enum name='goal' type-name='army_controller_goal_type'/>
+
+        <size_t name='pool_id'/>
     </struct-type>
 
     <struct-type type-name='army_controller_handlerst'>

df.building.xml

@@ -104,9 +104,12 @@
         <enum-item name='GoodsOther'/>
         <enum-item name='GoodsCoreQuality'/>
         <enum-item name='GoodsTotalQuality'/>
+        <enum-item name='GoodsColor'/>
         <enum-item name='Leather'>
             <item-attr name='is_category' value='true'/>
         </enum-item>
+        <enum-item name='LeatherType'/>
+        <enum-item name='LeatherColor'/>
         <enum-item name='Cloth'>
             <item-attr name='is_category' value='true'/>
         </enum-item>
@@ -118,6 +121,7 @@
         <enum-item name='ClothPlant'/>
         <enum-item name='ClothYarn'/>
         <enum-item name='ClothMetal'/>
+        <enum-item name='ClothColor'/>
         <enum-item name='Wood'>
             <item-attr name='is_category' value='true'/>
         </enum-item>
@@ -144,6 +148,7 @@
         <enum-item name='ArmorOther'/>
         <enum-item name='ArmorCoreQuality'/>
         <enum-item name='ArmorTotalQuality'/>
+        <enum-item name='ArmorColor'/>
         <enum-item name='Sheet'>
             <item-attr name='is_category' value='true'/>
         </enum-item>
@@ -809,11 +814,17 @@
                     index-refers-to='(material-by-id 0 $)'/>
         <static-array type-name='bool' name='quality_core' count='7' index-enum='item_quality'/>
         <static-array type-name='bool' name='quality_total' count='7' index-enum='item_quality'/>
+        <stl-vector type-name='bool' name='color'/>
+        <bool name='dyed'/>
+        <bool name='undyed'/>
     </struct-type>
 
     <struct-type type-name='stockpile_parameter_leatherst'>
         <stl-vector type-name='bool' name='mats'
                     index-refers-to='(food-mat-by-idx $Leather $)'/>
+        <stl-vector type-name='bool' name='color'/>
+        <bool name='dyed'/>
+        <bool name='undyed'/>
     </struct-type>
 
     <struct-type type-name='stockpile_parameter_clothst'>
@@ -833,6 +844,9 @@
                     index-refers-to='(food-mat-by-idx $Yarn $)'/>
         <stl-vector type-name='bool' name='cloth_metal'
                     index-refers-to='(food-mat-by-idx $MetalThread $)'/>
+        <stl-vector type-name='bool' name='color'/>
+        <bool name='dyed'/>
+        <bool name='undyed'/>
     </struct-type>
 
     <struct-type type-name='stockpile_parameter_sheetst'>
@@ -903,10 +917,13 @@
         <stl-vector type-name='bool' name='other_mats' index-enum='stockpile_armor_mat'/>
         <stl-vector type-name='bool' name='mats'
                     index-refers-to='(material-by-id 0 $)'/>
+        <stl-vector type-name='bool' name='color'/>
         <static-array type-name='bool' name='quality_core' count='7' index-enum='item_quality'/>
         <static-array type-name='bool' name='quality_total' count='7' index-enum='item_quality'/>
         <bool name='usable'/>
         <bool name='unusable'/>
+        <bool name='dyed'/>
+        <bool name='undyed'/>
     </struct-type>
 
     <struct-type type-name='stockpile_settings' original-name='stockpile_parameterst'>
@@ -2749,6 +2766,7 @@
         <bool name="use_contains"/>
 
         <enum name='has_tool_use' type-name='tool_uses'/>
+        <int32_t name='dye_color' ref-target='descriptor_color'/>
         <enum name='has_melee_skill' type-name='job_skill' since='v0.34.01'/>
 
         <bool name='can_steal_haul_items' comment='noticed in v0.40.24'/>

df.d_basics.xml

@@ -4,6 +4,14 @@
         <static-array name='s' count='2' type-name='uint64_t'/>
     </struct-type>
 
+    <struct-type type-name='entity_dye_descriptor_profilest'>
+        <int32_t name='color_index' ref-target='descriptor_color'/>
+        <stl-vector type-name='int32_t' name='dye_material' comment='NOT material_type'/>
+        <stl-vector type-name='int32_t' name='dye_matg' comment='NOT matgloss_type'/>
+        <stl-vector type-name='int8_t' name='degree'/>
+        <stl-vector type-name='int32_t' name='target_index'/>
+   </struct-type>
+
     <enum-type type-name='civzone_type' base-type='int32_t'> bay12: BuildingCivzoneType
         <enum-item name="Home"/>
         <enum-item name="Depot"/>
@@ -3813,6 +3821,7 @@
         <enum-item name="INSTRUMENT_PIECE"/>
         <enum-item name="WRITING"/>
         <enum-item name="IMAGE_SET"/>
+        <enum-item name="COLORATION"/>
     </enum-type>
 
     <enum-type type-name='itemimprovement_specific_type' base-type='int32_t'> bay12: ItemSpecificImprovementType

df.d_interface.xml

@@ -104,6 +104,7 @@
         <int32_t name='contains_reaction_index'/>
         <int32_t name='contains_reagent_index'/>
         <enum name='tool_use' type-name='tool_uses'/>
+        <int32_t name='dye_color' ref-target='descriptor_color'/>
 
         <stl-string name='display_string'/>
 
@@ -116,10 +117,13 @@
         <enum name='item_type' type-name='item_type' init-value='NONE'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index'/>
-        <int32_t name="mat_index"/>
+        <int32_t name="mat_index" comment='union: mix_dye_desired_color_index'/>
         <compound name='specflag' type-name='job_spec_flags'/>
         <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name="material_category" type-name='job_material_category'/>
+        <enum name='art_specifier' type-name='job_art_specifier_type'/>
+        <int32_t name='art_specifier_id1'/>
+        <int32_t name='art_specifier_id2'/>
         <int32_t name='match_value' init-value='1'/>
 
         <stl-string name='name'/>
@@ -222,6 +226,10 @@
         <enum-item name='OTHER'/>
         <enum-item name='METAL'/>
         <enum-item name='SELECT_MEMORIAL_UNIT'/>
+        <enum-item name='MIX_DYE_COLOR'/>
+        <enum-item name='DYE_CLOTH_COLOR'/>
+        <enum-item name='DYE_THREAD_COLOR'/>
+        <enum-item name='DYE_LEATHER_COLOR'/>
     </enum-type>
 
     <enum-type type-name='interface_category_construction'> bay12: InterfaceCategoryConstruction
@@ -247,6 +255,7 @@
         <bool name="leave_button"/>
         <bitfield name='flag' base-type='uint32_t' type-name='interface_button_flag'/>
         <stl-string name='filter_str'/>
+        <int32_t name='alpha_order'/>
 
         <virtual-methods>
             <vmethod name='print_info' comment='ghost, buried, memorialized'>
@@ -276,6 +285,7 @@
             <vmethod name='get_info_string'>
                 <ret-type><pointer type-name='stl-string'/></ret-type>
             </vmethod>
+            <vmethod name='get_swatch_color' ret-type='int32_t'/>
             <vmethod is-destructor='true'/>
         </virtual-methods>
     </class-type>
@@ -293,6 +303,14 @@
         <int8_t name="prepare_interface"/>
     </class-type>
 
+    <class-type type-name='interface_button_building_color_selectorst'
+                inherits-from='interface_button_buildingst'>
+        <enum name='job' type-name='job_type'/>
+        <int32_t name='color_index' ref-target='descriptor_color'/>
+        <int8_t name='prepare_interface'/>
+        <stl-string name='info'/>
+    </class-type>
+
     <class-type type-name='interface_button_building_category_selectorst'
                 inherits-from='interface_button_buildingst'>
         <enum type-name='interface_category_building' name='category'/>
@@ -306,12 +324,15 @@
         <enum name='itemtype' type-name='item_type'/>
         <int16_t name='subtype'/>
         <int16_t name='material' ref-target='material' aux-value='$$.matgloss'/>
-        <int32_t name='matgloss'/>
+        <int32_t name='matgloss' comment='union: mix_dye_desired_color_index'/>
         <compound name='specflag' type-name='job_spec_flags'/>
         <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name='job_item_flag' type-name='job_material_category'/>
         <bool name='add_building_location'/>
         <bool name='show_help_instead'/>
+        <enum name='art_specifier' type-name='job_art_specifier_type'/>
+        <int32_t name='art_specifier_id1'/>
+        <int32_t name='art_specifier_id2'/>
 
         <stl-string name='objection'/>
         <stl-string name='info'/>
@@ -333,6 +354,8 @@
         <int16_t name='material' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='matgloss'/>
         <bitfield name='job_item_flag' type-name='job_material_category'/>
+        <enum name='job' type-name='job_type'/>
+        <int32_t name='color_index' ref-target='descriptor_color'/>
 
         <stl-string name='current_custom_category_token' since='v0.42.01'/>
         <compound name='current_tool_tip' type-name='curses_text_boxst'/>
@@ -556,6 +579,9 @@
         <enum-item name='IMAGE'/>
         <enum-item name='CLOTHING_SIZE'/>
         <enum-item name='IMPROVEMENT_TYPE'/>
+        <enum-item name='DYE_OBJECT_COLOR'/>
+        <enum-item name='MIX_DYE_COLOR'/>
+        <enum-item name='PLANT'/>
     </enum-type>
 
     <enum-type type-name='job_details_context_type' base-type='int32_t'> bay12: JobDetailsContextType
@@ -603,6 +629,60 @@
         <stl-vector name='improvement_type' type-name='improvement_type'/>
         <int32_t name='scroll_position_improvement'/>
         <bool name='scrolling_improvement'/>
+
+        <int32_t name='dye_object_job_type'/>
+        <stl-vector type-name='int32_t' name='dye_object_target_color'/>
+        <stl-vector type-name='int32_t' name='dye_object_target_color_available'/>
+        <stl-bit-vector name='dye_object_target_color_is_tint'/>
+        <stl-vector type-name='int32_t' name='dye_object_target_color_master'/>
+        <stl-vector type-name='int32_t' name='dye_object_target_color_available_master'/>
+        <stl-bit-vector name='dye_object_target_color_is_tint_master'/>
+        <int32_t name='scroll_position_dye_object'/>
+        <bool name='scrolling_dye_object'/>
+
+        <int32_t name='dye_object_tint_color'/>
+        <stl-vector type-name='int32_t' name='dye_object_tint_reagent_color1'/>
+        <stl-vector type-name='int32_t' name='dye_object_tint_reagent_color2'/>
+        <stl-vector type-name='int32_t' name='dye_object_tint_reagent_available'/>
+        <stl-vector type-name='int32_t' name='dye_object_tint_reagent_color1_master'/>
+        <stl-vector type-name='int32_t' name='dye_object_tint_reagent_color2_master'/>
+        <stl-vector type-name='int32_t' name='dye_object_tint_reagent_available_master'/>
+        <int32_t name='scroll_position_dye_object_reagents'/>
+        <bool name='scrolling_dye_object_reagents'/>
+
+        <stl-string name='dye_object_filter'/>
+        <bool name='dye_object_doing_filter'/>
+
+        <stl-vector type-name='int32_t' name='mix_dye_target_color'/>
+        <stl-vector type-name='int32_t' name='mix_dye_target_color_available'/>
+        <stl-vector type-name='int32_t' name='mix_dye_target_color_master'/>
+        <stl-vector type-name='int32_t' name='mix_dye_target_color_available_master'/>
+        <int32_t name='scroll_position_mix_dye'/>
+        <bool name='scrolling_mix_dye'/>
+
+        <int32_t name='mix_dye_chosen_target_color'/>
+        <stl-vector type-name='int32_t' name='mix_dye_reagent_color1'/>
+        <stl-vector type-name='int32_t' name='mix_dye_reagent_color2'/>
+        <stl-vector type-name='int32_t' name='mix_dye_reagent_available'/>
+        <stl-vector type-name='int32_t' name='mix_dye_reagent_color1_master'/>
+        <stl-vector type-name='int32_t' name='mix_dye_reagent_color2_master'/>
+        <stl-vector type-name='int32_t' name='mix_dye_reagent_available_master'/>
+        <int32_t name='scroll_position_mix_dye_reagents'/>
+        <bool name='scrolling_mix_dye_reagents'/>
+
+        <stl-string name='mix_dye_filter'/>
+        <bool name='mix_dye_doing_filter'/>
+
+        <stl-vector type-name='int16_t' name='plant_mat'/>
+        <stl-vector type-name='int32_t' name='plant_matgloss'/>
+        <stl-vector type-name='int32_t' name='plant_count'/>
+        <stl-vector type-name='int16_t' name='plant_mat_master'/>
+        <stl-vector type-name='int32_t' name='plant_matgloss_master'/>
+        <stl-vector type-name='int32_t' name='plant_count_master'/>
+        <int32_t name='scroll_position_plant'/>
+        <bool name='scrolling_plant'/>
+        <stl-string name='plant_filter'/>
+        <bool name='plant_doing_filter'/>
     </struct-type>
 
     <struct-type type-name='buildjob_interfacest'>
@@ -634,6 +714,8 @@
         <enum-item name='WEAPON_NON_USABLE'/>
         <enum-item name='ARMOR_USABLE'/>
         <enum-item name='ARMOR_NON_USABLE'/>
+        <enum-item name='UNDYED'/>
+        <enum-item name='DYED'/>
     </enum-type>
 
     <struct-type type-name='custom_stockpile_interfacest'>

df.descriptor.xml

@@ -7,11 +7,17 @@
         <stl-string name="name"/>
         <enum name='color' type-name='curses_color' base-type='int8_t'/>
         <int8_t name='bold'/>
+        <static-array name='orig_rgb' type-name='int32_t' count='3'/>
         <s-float name="red"/>
         <s-float name="green"/>
         <s-float name="blue"/>
 
         <compound name='palette' type-name='palettest'/>
+        <int32_t name='texpos_swatch'/>
+    </struct-type>
+
+    <struct-type type-name='color_mixst'>
+        <static-array name='mix_index' type-name='int32_t' count='7'/>
     </struct-type>
 
     <bitfield-type type-name='shape_flag' base-type='uint32_t'> bay12: SHAPE_FLAG_*

df.entity.xml

@@ -1653,6 +1653,8 @@
         <stl-vector name='local_dance_form' since='v0.42.01' pointer-type='dance_form'/>
         <stl-vector name='well_known_wc' since='v0.42.01' pointer-type='written_content'/>
 
+        <stl-vector name='dye_description_profile' pointer-type='entity_dye_descriptor_profilest'/>
+
         -- worldgen only, unsaved
         <int16_t name='settlement_x' init-value='-1'/>
         <int16_t name='settlement_y' comment='uninitialized'/>

df.g_src.enabler.xml

@@ -193,13 +193,19 @@
                     <enum-item name='push_resize'/>
                     <enum-item name='pop_resize'/>
                     <enum-item name='reset_textures'/>
+                    <enum-item name='show_message'/>
                 </enum>
                 <compound is-union='true'>
                     <int32_t name='fps'/>
                     <compound>
                         <int32_t name='x'/>
                         <int32_t name='y'/>
                     </compound>
+                    <compound>
+                        <pointer name='text' type-name='static-string'/>
+                        <pointer name='caption' type-name='static-string'/>
+                        <uint32_t name='type'/>
+                    </compound>
                 </compound>
             </stl-deque>
         </compound>
@@ -240,6 +246,8 @@
         <uint32_t name='clock' comment='An *approximation* of the current time for use in garbage collection thingies, updated every frame or so.'/>
         <bool name='mouse_focus'/>
         <static-array type-name='uint8_t' count='32' name='last_text_input'/>
+        <bool name='listening_to_text'/>
+        <int32_t name='last_message_result' comment='std::atomic_int'/>
 
         <virtual-methods>
             <vmethod ret-type='stl-string' name='GetKeyDisplay'>