update structures for 51.01-beta19

quietust · Jul 16, 2024 · 348262b · 348262b
1 parent 377482d
commit 348262b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 7 deletions.
diff --git a/df.advmode.xml b/df.advmode.xml
@@ -495,6 +495,8 @@
     <struct-type type-name='adventurest'>
         <enum base-type='int16_t' name='menu' type-name='ui_advmode_menu'/>
 
+        <pointer name='dungeon_screen' type-name='viewscreen_dungeonmodest'/>
+
         <int8_t name='site_level_zoom' comment='bay12: viewmode; when set, the travel map is zoomed in to show site details'/>
         <int32_t name='travel_origin_x' comment='bay12: local_apparent_abs_smm_x'/>
         <int32_t name='travel_origin_y' comment='bay12: local_apparent_abs_smm_y'/>  Coordinates of the player on the map when the travel screen is opened. Determine the displayed position whilst travel_not_moved is set
@@ -745,6 +747,7 @@
             <stl-vector name='party_core_members' type-name='int32_t' ref-target='historical_figure' since='v0.47.01' comment='Contains IDs of the non-pet historical figures that the player party started off with. Figures in this list are eligible for control via tactical mode.'/>
             <stl-vector name='party_pets' type-name='int32_t' ref-target='historical_figure' since='v0.47.01' comment='Contains historical figure IDs of pets owned by the party, both those that the player started off with as well as others claimed later on.'/>
             <stl-vector name='party_extra_members' type-name='int32_t' ref-target='historical_figure' comment='Contains IDs of non-pet historical figures who joined the player party later on.'/>
+            <stl-vector name='party_extra_pets' type-name='int32_t' ref-target='historical_figure' comment='Contains IDs of pet historical figures who joined the player party later on.'/>
 
             <stl-vector name='it_list' pointer-type='interaction_target_instance_listst'/>
 
@@ -874,14 +877,28 @@
         <enum-item name='SERMON_SPHERE'/>
         <enum-item name='SERMON_PROMOTE_VALUE'/>
         <enum-item name='SERMON_REFUSE_VALUE'/>
+        <enum-item name='COMPOSE'/>
+        <enum-item name='COMPOSE_POEM'/>
+        <enum-item name='COMPOSE_POETIC_FORM_BY_INDEX'/>
+        <enum-item name='COMPOSE_MUSICAL_COMPOSITION'/>
+        <enum-item name='COMPOSE_MUSICAL_FORM_BY_INDEX'/>
+        <enum-item name='COMPOSE_CHOREOGRAPHY'/>
+        <enum-item name='COMPOSE_DANCE_FORM_BY_INDEX'/>
+        <enum-item name='WRITE'/>
+        <enum-item name='WRITE_TARGET'/>
+        <enum-item name='WRITE_FORM_BY_INDEX'/>
+        <enum-item name='WRITE_WC_BY_INDEX'/>
     </enum-type>
 
     <struct-type type-name='performance_menu_choicest'>
         <enum name='type' type-name='performance_menu_choice_type'/>
         <stl-string name='print_name'/>
         <stl-string name='list_name'/>
         <stl-string name='simple_filter_name'/>
-        <int32_t name='id'/>
+        <compound is-union='true'>
+            <int32_t name='id'/>
+            <int32_t name='index'/>
+        </compound>
         <pointer name='iden' type-name='identity'/>
     </struct-type>
 

diff --git a/df.graphics.xml b/df.graphics.xml
@@ -304,11 +304,11 @@
             <compound type-name='interface_setst' name='graphical_interface'/>
             <compound type-name='interface_setst' name='classic_interface'/>
 
-            <static-array type-name='int32_t' count='13188' name='texture_indices3'/>
+            <static-array type-name='int32_t' count='13284' name='texture_indices3'/>
             <stl-vector type-name='int32_t' name='texpos_boulder'/>
             <static-array type-name='int32_t' count='3905' name='texture_indices4'/>
             <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
-            <static-array type-name='int32_t' count='7969' name='texture_indices5'/>
+            <static-array type-name='int32_t' count='7977' name='texture_indices5'/>
             <static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
             <static-array type-name='int32_t' count='101' name='texture_indices6'/>
             <static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
@@ -548,6 +548,9 @@
         <static-array type-name='int32_t' count='4' name='texpos_embark_contract_x_active'/>
         <static-array type-name='int32_t' count='4' name='texpos_embark_contract_x_inactive'/>
 
+        <static-array type-name='int32_t' count='4' name='texpos_adventure_burden_light'/>
+        <static-array type-name='int32_t' count='4' name='texpos_adventure_burden_heavy'/>
+
         <int32_t name='texpos_bottom_button_border_nw'/>
         <int32_t name='texpos_bottom_button_border_w'/>
         <int32_t name='texpos_bottom_button_border_n'/>

diff --git a/df.ui-menus.xml b/df.ui-menus.xml
@@ -1270,6 +1270,11 @@
         <enum-item name='SERMON_SPHERE'/>
         <enum-item name='SERMON_PROMOTE_VALUE'/>
         <enum-item name='SERMON_REFUSE_VALUE'/>
+        <enum-item name='COMPOSE_POEM'/>
+        <enum-item name='COMPOSE_MUSICAL_COMPOSITION'/>
+        <enum-item name='COMPOSE_CHOREOGRAPHY'/>
+        <enum-item name='WRITE_TARGET'/>
+        <enum-item name='WRITE_FORM_OR_WC'/>
     </enum-type>
 
     <enum-type type-name='attack_move_choice_type' base-type='int32_t'> bay12: AttackMoveChoiceType
@@ -2604,9 +2609,22 @@
                 <int32_t name='relevant_id'/>
 
                 <compound name='color_box' type-name='color_text_boxst'/>
-                <int32_t name='scroll_position_text'/>
-                <bool name='scrolling_text'/>
-                <int32_t name='color_box_choice_index'/>
+                <pointer name='color_box_choice' type-name='performance_menu_choicest'/>
+                <int32_t name='para_tex_width'/>
+
+                <pointer name='un' type-name='unit'/>
+                <stl-vector name='total_item_list' pointer-type='item'/>
+
+                <stl-vector name='compose_writing_form' type-name='written_content_type'/>
+                <stl-vector name='poetic_form' pointer-type='poetic_form'/>
+                <stl-vector name='musical_form' pointer-type='musical_form'/>
+                <stl-vector name='dance_form' pointer-type='dance_form'/>
+                <enum name='selected_writing_form' type-name='written_content_type'/>
+
+                <pointer name='write_object' type-name='item'/>
+                <stl-vector name='write_target' pointer-type='item'/>
+                <stl-vector name='write_writing_form' type-name='written_content_type'/>
+                <stl-vector name='write_wc' pointer-type='written_content'/>
             </compound>
 
             <compound name='attack'> bay12: adventure_interface_attackst
@@ -2705,6 +2723,9 @@
                 <int32_t name='scroll_position_cl'/>
                 <bool name='scrolling_cl'/>
                 <int32_t name='old_scroll_position_cl'/>
+
+                <bool name='allow_strike'/>
+                <bool name='allow_wrestle'/>
             </compound>
 
             <compound name='combat_pref'> bay12: adventure_interface_combat_prefst
@@ -2752,7 +2773,6 @@
                 <bool name='open'/>
 
                 <bool name='no_sky'/>
-                <pointer name='dungeon_screen' type-name='viewscreen_dungeonmodest'/>
             </compound>
 
             <compound name='movement_options'> bay12: adventure_interface_movement_optionsst

diff --git a/df.ui.xml b/df.ui.xml
@@ -855,6 +855,7 @@
             </bitfield>
         </static-array>
         <static-array name='unit_move_coord' count='500'><int32_t name='x'/><int32_t name='y'/></static-array>
+        <static-array name='unit_move_coord_mxy' count='500'><int32_t name='x'/><int32_t name='y'/></static-array>
         <static-array name='unit_move_phase' count='500' type-name='int32_t'/>
         <int32_t name='unit_move_num'/>
         <int32_t name='unit_move_greatest_phase'/>