Sync user interface structures to Toady headers

DFHack · Jun 8, 2024 · f7dd835 · f7dd835
1 parent fd09ae6
commit f7dd835
Show file tree

Hide file tree

Showing 10 changed files with 880 additions and 936 deletions.
diff --git a/df.buildings.xml b/df.buildings.xml
@@ -1255,6 +1255,15 @@
         </bitfield>
     </struct-type>
 
+    <struct-type type-name='track_stop_profilest'>
+        <int32_t name='friction' init-value='50000' since='v0.34.08'/>
+        <bitfield name='track_flags' base-type='uint32_t'> bay12: TRACK_STOP_PROFILE_FLAG_*
+            <flag-bit name='use_dump'/>
+        </bitfield>
+        <int32_t name='dump_x_shift' since='v0.34.08'/>
+        <int32_t name='dump_y_shift' since='v0.34.08'/>
+    </struct-type>
+
     <class-type type-name='building_trapst' inherits-from='building_actual'>
         <enum base-type='int16_t' name='trap_type' type-name='trap_type'/>
         <int8_t name='state' comment='!=0 = pulled, tripped/needs reloading'/>
@@ -1272,14 +1281,7 @@
 
         <compound name='plate_info' type-name='pressure_plate_info'/>
 
-        <!-- <compound name='track_stop_info' comment='track_stop_profilest'> -->
-        <int32_t name='friction' init-value='50000' since='v0.34.08'/>
-        <bitfield name='track_flags' base-type='uint32_t'> bay12: TRACK_STOP_PROFILE_FLAG_*
-            <flag-bit name='use_dump'/>
-        </bitfield>
-        <int32_t name='dump_x_shift' since='v0.34.08'/>
-        <int32_t name='dump_y_shift' since='v0.34.08'/>
-        <!-- </compound> -->
+        <compound name='track_stop_info' type-name='track_stop_profilest'/>
         <int8_t name='stop_trigger_timer' since='v0.34.08'/>
     </class-type>
 

diff --git a/df.entities.xml b/df.entities.xml
@@ -161,6 +161,34 @@
         </bitfield>
     </struct-type>
 
+    <struct-type type-name='tradegoodslistst'>
+        <pointer name='it' type-name='item'/>
+        <int32_t name='dist'/>
+        <int8_t name='tag'/>
+        <bool name='prohibited'/>
+        <int32_t name='value'/>
+        <bool name='expanded_container'/>
+        <int32_t name='container_amount'/>
+        <int32_t name='sort_value'/>
+    </struct-type>
+
+    <struct-type type-name='assign_trade_itemlistst'>
+        <stl-vector name='tgi' pointer-type='tradegoodslistst'/>
+    </struct-type>
+
+    <struct-type type-name='abstractitemlistst'>
+        <stl-vector name='type' type-name='int16_t'/>
+        <stl-vector name='subtype' type-name='int16_t'/>
+        <stl-vector name='subcat1' type-name='int16_t'/>
+        <stl-vector name='subcat2' type-name='int16_t'/>
+        <stl-vector name='amount' type-name='int32_t'/>
+        <stl-bit-vector name='expanded'/>
+    </struct-type>
+
+    <struct-type type-name='itemlistst'>
+        <stl-vector name='l_item' pointer-type='item'/>
+    </struct-type>
+
     <struct-type type-name='caravan_state' original-name='plot_merchantst'>
         <compound name='total_capacity' type-name='massst'/>
         <enum name='trade_state' base-type='int8_t' comment='bay12: stage'>

diff --git a/df.globals.xml b/df.globals.xml
@@ -185,7 +185,9 @@
     </global-object>
 
     <!-- To find: place loo'k' cursor over a unit, trace pointers to unit -->
-    <global-object name='ui_look_list' original-name='looklist' type-name='ui_look_list'/>
+    <global-object name='ui_look_list' original-name='looklist'>
+        <stl-vector pointer-type='lookinfost'/>
+    </global-object>
 
     <!-- To find: select a unit in 'v'iew, open inventory page, trace unit.inventory.* pointers -->
     <global-object name='game' type-name='gamest'/>

diff --git a/df.history.xml b/df.history.xml
@@ -560,36 +560,42 @@
         <int32_t name='last_holder_hf' ref-target='historical_figure'/>
     </struct-type>
 
+    <struct-type type-name='relationship_profile_hf_visualst'>
+        <int32_t name='histfig_id' ref-target='historical_figure'/>
+        <bitfield name='flags'> bay12: RELATIONSHIP_PROFILE_HF_FLAG_*
+            <flag-bit name='basic_name_known'/>
+        </bitfield>
+        <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity' comment="Involves adventurer knowing name?"/>
+        <stl-vector name="attitude" type-name='reputation_type' comment="Probably ordered"/>
+        <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element. Guess 0 - 100"/>
+        <enum name='rank' type-name='vague_relationship_type' since='v0.47.01'/>
+        <compound name='core' type-name='core_hf_relationshipst'/>
+        <int32_t name='meet_count' since='v0.44.10'/>
+        <int32_t name='last_meet_year' comment="probably latest contact. Seen -1"/>
+        <int32_t name='last_meet_season_tick'/>
+        <int32_t name='abs_x' since='v0.47.01'/>
+        <int32_t name='abs_y' since='v0.47.01'/>
+        <int32_t name='abs_z' since='v0.47.01'/>
+        <int32_t name='transient_attitude' since='v0.47.01'/>
+        <int32_t name='transient_patience' since='v0.47.01'/>
+        <int32_t name='transient_confidence' since='v0.47.01'/>
+        <int32_t name='transient_agitation' since='v0.47.01'/>
+        <int32_t name='transient_failed_persuade_attempts' since='v0.47.01'/>
+        <int32_t name='transient_failed_intimidate_attempts' since='v0.47.01'/>
+        <int32_t name='first_year' comment="transient_last_reset" since='v0.47.01'/>
+        <int32_t name='first_year_tick' since='v0.47.01'/>
+    </struct-type>
+
+    <struct-type type-name='relationship_profile_hf_historicalst'>
+        <int32_t name='histfig_id' ref-target='historical_figure'/>
+        <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity'/>
+        <stl-vector name="attitude" type-name='reputation_type'/>
+        <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element"/>
+        <compound name='core' type-name='core_hf_relationshipst'/>
+    </struct-type>
+
     <struct-type type-name='historical_figure_relationships' original-name='relationship_profilest'>
-        <stl-vector name='hf_visual'>
-            <pointer> bay12: relationship_profile_hf_visualst
-                <int32_t name='histfig_id' ref-target='historical_figure'/>
-                <bitfield name='flags'> bay12: RELATIONSHIP_PROFILE_HF_FLAG_
-                    <flag-bit name='basic_name_known'/>
-                </bitfield>
-                <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity' comment="Involves adventurer knowing name?"/>
-                <stl-vector name="attitude">
-                    <enum type-name='reputation_type' comment="Probably ordered"/>
-                </stl-vector>
-                <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element. Guess 0 - 100"/>
-                <enum name='rank' type-name='vague_relationship_type' since='v0.47.01'/>
-                <compound name='core' type-name='core_hf_relationshipst'/>
-                <int32_t name='meet_count' since='v0.44.10'/>
-                <int32_t name='last_meet_year' comment="probably latest contact. Seen -1"/>
-                <int32_t name='last_meet_season_tick'/>
-                <int32_t name='abs_x' since='v0.47.01'/>
-                <int32_t name='abs_y' since='v0.47.01'/>
-                <int32_t name='abs_z' since='v0.47.01'/>
-                <int32_t name='transient_attitude' since='v0.47.01'/>
-                <int32_t name='transient_patience' since='v0.47.01'/>
-                <int32_t name='transient_confidence' since='v0.47.01'/>
-                <int32_t name='transient_agitation' since='v0.47.01'/>
-                <int32_t name='transient_failed_persuade_attempts' since='v0.47.01'/>
-                <int32_t name='transient_failed_intimidate_attempts' since='v0.47.01'/>
-                <int32_t name='first_year' comment="transient_last_reset" since='v0.47.01'/>
-                <int32_t name='first_year_tick' since='v0.47.01'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='hf_visual' pointer-type='relationship_profile_hf_visualst'/>
         <!--
             Entries with a 'rank' value of zero are suppressed from display. Display order seems to depend on
             the value of the first 'attitude' entry.
@@ -604,15 +610,7 @@
             The role of 'counter' is unknown, but might somehow tick over into an increase in rank. It does not seem
             to play any part in the display sort order.
         -->
-        <stl-vector name='hf_historical' since='v0.44.01'>
-            <pointer> bay12: relationship_profile_hf_historicalst
-                <int32_t name='histfig_id' ref-target='historical_figure'/>
-                <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity'/>
-                <stl-vector name="attitude" type-name='reputation_type'/>
-                <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element"/>
-                <compound name='core' type-name='core_hf_relationshipst'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='hf_historical' since='v0.44.01' pointer-type='relationship_profile_hf_historicalst'/>
         <stl-vector name='hf_identity' since='v0.44.01'>
             <pointer> bay12: relationship_profile_hf_identityst
                 <int32_t name='identity_id' ref-target='identity'/>

diff --git a/df.jobs.xml b/df.jobs.xml
@@ -125,6 +125,12 @@
         <bitfield name='encrust_flags' type-name='stockpile_group_set'/>
     </struct-type>
 
+    <struct-type type-name='job_spec_data' is-union='true'>
+        <int32_t name="hist_figure_id" ref-target='historical_figure'/>
+        <int32_t name="race" ref-target='creature_raw'/>
+        <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
+    </struct-type>
+
     <struct-type type-name='job' original-name='jobst' df-list-link-type='job_list_link' df-list-link-field='list_link' key-field='id'>
         <int32_t name='id' init-value='-1'/>
         <pointer name='list_link' type-name='job_list_link'/>
@@ -150,11 +156,7 @@
         <int16_t name='item_subtype' init-value='-1' comment='when StoreInStockpile this is a unit_labor'/>
 
         <compound name='specflag' type-name='job_spec_flags'/>
-        <compound is-union='true'> bay12: spec_id
-            <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-            <int32_t name="race" ref-target='creature_raw'/>
-            <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
-        </compound>
+        <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name='material_category' type-name='job_material_category' comment='bay12: uint32_t job_item_flag'/>
 
         <stl-string name='reaction_name'/>
@@ -449,11 +451,7 @@
         <int32_t name="mat_index" init-value='-1'/>
 
         <compound name='specflag' type-name='job_spec_flags'/>
-        <compound is-union='true'> bay12: spec_id
-            <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-            <int32_t name="race" ref-target='creature_raw'/>
-            <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
-        </compound>
+        <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name="material_category" type-name='job_material_category'/>
 
         <compound name='art_spec' type-name='job_art_specification'/>
@@ -524,11 +522,7 @@
         <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name="mat_index"/>
         <compound name='specflag' type-name='job_spec_flags'/>
-        <compound is-union='true'> bay12: spec_id
-            <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-            <int32_t name="race" ref-target='creature_raw'/>
-            <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
-        </compound>
+        <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name="material_category" type-name='job_material_category'/>
         <int32_t name='match_value' init-value='1'/>