Skip to content

Commit

Permalink
Update structures for 51.01-beta18
Browse files Browse the repository at this point in the history
  • Loading branch information
@quietust
quietust committed Jun 25, 2024
1 parent d0a41ec commit dbd731f
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 6 deletions.
2 changes: 1 addition & 1 deletion df.creature-raws.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,7 @@
<enum-item name='SPLINTABLE'/>
</enum-type>

<enum-type type-name='tissue_shape_type'> bay12: TissueShapeType
<enum-type type-name='tissue_shape_type' base-type='int16_t'> bay12: TissueShapeType
<enum-item name='LAYER'/>
<enum-item name='STRANDS'/>
<enum-item name='FEATHERS'/>
Expand Down
13 changes: 12 additions & 1 deletion df.graphics.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
<static-array type-name='long' count='1' name='black_background_texpos'/>
<static-array type-name='int32_t' count='119' name='texture_indices1'/>
<stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
<static-array type-name='int32_t' count='10798' name='texture_indices2'/>
<static-array type-name='int32_t' count='10807' name='texture_indices2'/>

<compound type-name='interface_setst' name='graphical_interface'/>
<compound type-name='interface_setst' name='classic_interface'/>
Expand Down Expand Up @@ -505,6 +505,17 @@
<static-array count='7' name='texpos_button_inventory_item'><static-array count='3'><static-array type-name='int32_t' count='3'/></static-array></static-array>

<static-array count='21' name='texpos_adventure_travel_dir' type-name='int32_t'/>

<int32_t name='texpos_skill_progress_bar_left_full'/>
<int32_t name='texpos_skill_progress_bar_mid_full'/>
<int32_t name='texpos_skill_progress_bar_right_full'/>
<int32_t name='texpos_skill_progress_bar_left_half'/>
<int32_t name='texpos_skill_progress_bar_mid_half'/>
<int32_t name='texpos_skill_progress_bar_right_half'/>
<int32_t name='texpos_skill_progress_bar_left_empty'/>
<int32_t name='texpos_skill_progress_bar_mid_empty'/>
<int32_t name='texpos_skill_progress_bar_right_empty'/>

<static-array count='2' name='texpos_liquid_numbers_on'><static-array type-name='int32_t' count='2'/></static-array>
<static-array count='2' name='texpos_liquid_numbers_off'><static-array type-name='int32_t' count='2'/></static-array>
<static-array count='2' name='texpos_ramp_arrows_on'><static-array type-name='int32_t' count='2'/></static-array>
Expand Down
42 changes: 42 additions & 0 deletions df.ui-menus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
<enum-item name='JOB_DETAILS_MAIN'/>
<enum-item name='JOB_DETAILS_IMPROVEMENT'/>
<enum-item name='DESIGNATION_ENGRAVING'/>
<enum-item name='ADVENTURER_CREATION'/>
</enum-type>

<enum-type type-name='image_creator_option_type' base-type='int32_t'> bay12: ImageCreatorOptionType
Expand Down Expand Up @@ -1241,6 +1242,16 @@
<enum-item name='NORMAL'/>
</enum-type>

<enum-type type-name='adventure_interface_create_mode_type' base-type='int32_t'> bay12: AdventureInterfaceCreateModeType
<enum-item name='NONE' value='-1'/>
<enum-item name='MAIN_LIST'/>
<enum-item name='CHOOSE_BUTCHER_TARGET'/>
<enum-item name='CHOOSE_BUTCHER_CUTTER'/>
<enum-item name='CHOOSE_REACTION_REAGENT'/>
<enum-item name='SPECIFY_REACTION_IMAGES'/>
<enum-item name='FINISHED_REACTION_IMAGES'/>
</enum-type>

<enum-type type-name='performance_menu_mode_type' base-type='int32_t'> bay12: PerformanceMenuModeType
<enum-item name='NONE' value='-1'/>
<enum-item name='START'/>
Expand Down Expand Up @@ -2834,6 +2845,37 @@
<bool name='scrolling'/>
<int32_t name='scroll_position'/>
</compound>

<compound name='create'> bay12: adventure_interface_createst
<bool name='open'/>

<enum name='mode' type-name='adventure_interface_create_mode_type'/>

<stl-vector name='total_item_list' pointer-type='item'/>

<bool name='scrolling'/>
<int32_t name='scroll_position'/>

<stl-vector name='reaction_list' pointer-type='reaction'/>
<stl-vector name='reaction_category' pointer-type='stl-string'/>
<stl-string name='current_reaction_category'/>
<stl-vector name='valid_item_list' pointer-type='item'/>
<stl-vector name='current_reagent_list' pointer-type='item'/>
<stl-vector name='current_reagent_index' type-name='int32_t'/>
<pointer name='selected_reaction' type-name='reaction'/>
<int32_t name='reagent_index'/>
<int32_t name='number_left'/>
<stl-vector name='prod_adv_art_specifier' pointer-type='adv_art_specifierst'/>
<int32_t name='prod_adv_art_index'/>
<bitfield name='exit_flag' base-type='uint32_t'> bay12: VLUA_INTERACTION_USE_FLAG_* (from viewscreen_layer_unit_actionst)
<flag-bit name='delayed'/>
<flag-bit name='already_retracted'/>
</bitfield>

<pointer name='butcher_object' type-name='item'/>
<stl-vector name='butcher_target' pointer-type='item'/>
<stl-vector name='butcher_cutter' pointer-type='item'/>
</compound>
</compound>

<stl-vector type-name='int32_t' name='viewunit_list'/>
Expand Down
9 changes: 5 additions & 4 deletions df.viewscreen.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,11 @@
<stl-vector name='custom_render'> <stl-function/> </stl-vector>
<stl-vector name='custom_activated'> <stl-function/> </stl-vector>
<stl-string name='name'/>
<bitfield name='visibility_flags' base-type='int8_t'> bay12: VisibilityFlagType
<flag-bit name='WIDGET_VISIBILITY_ACTIVE'/>
<flag-bit name='WIDGET_VISIBILITY_VISIBLE'/> plus ACTUALLY_VISIBLE for both of the above
<flag-bit name='WIDGET_VISIBILITY_CAN_KEY_ACTIVATE'/>
<bitfield name='visibility_flags' base-type='int8_t'> bay12: WidgetFlag
<flag-bit name='VISIBILITY_ACTIVE'/>
<flag-bit name='VISIBILITY_VISIBLE'/> plus ACTUALLY_VISIBLE for both of the above
<flag-bit name='CAN_KEY_ACTIVATE'/>
<flag-bit name='GLOBAL_POSITIONING'/>
</bitfield>
<int32_t name='offset_bottom'/>
<int32_t name='offset_left'/>
Expand Down

0 comments on commit dbd731f

Please sign in to comment.