Skip to content

Commit

Permalink
update structures for beta28
Browse files Browse the repository at this point in the history 
except for texture array sizes
  • Loading branch information
@myk002
myk002 committed Jan 8, 2025
1 parent efd16ef commit a93e445
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 17 deletions.
74 changes: 62 additions & 12 deletions df.advmode.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,43 @@
<enum-item name='ZONE_LOCATION'/>
</enum-type>

<enum-type type-name='adventure_travel_exception_type' base-type='int32_t'> bay12: AdventureTravelException
<enum-item name='GENERIC'/>
<enum-item name='UNDERGROUND_NO_TUNNEL'/>
<enum-item name='NO_LEGAL_SITE_REALIZATION_DIRECTION'/>
<enum-item name='NEAR_RIVER'/>
<enum-item name='BOGEYMEN'/>
<enum-item name='ENCOUNTER'/>
<enum-item name='STOLEN_GOODS'/>
<enum-item name='BLEEDING'/>
<enum-item name='CANT_BREATHE'/>
<enum-item name='THIRST'/>
<enum-item name='HUNGER'/>
<enum-item name='DROWNING'/>
<enum-item name='SWIMMING'/>
<enum-item name='IN_AIR'/>
<enum-item name='WATER_BIOME'/>
<enum-item name='MOUNTAIN_BIOME'/>
<enum-item name='ON_VEHICLE'/>
<enum-item name='ON_PROJECTILE'/>
<enum-item name='MUST_LEAVE_SITE'/>
<enum-item name='NUM'/>
<enum-item name='NONE'/> NOT -1
</enum-type>

<enum-type type-name='sound_indicator_type' base-type='int32_t'> bay12: SoundIndicatorType
<enum-item name='NONE' value='-1'/>
<enum-item name='MOVEMENT'/>
<enum-item name='COMBAT'/>
<enum-item name='VOCALIZATION'/>
<enum-item name='GRINDING_MECHANISM'/>
<enum-item name='STORYTELLING'/>
<enum-item name='POEM_RECITATION'/>
<enum-item name='MUSICAL_VOICE'/>
<enum-item name='DANCING'/>
<enum-item name='PREACHING'/>
</enum-type>

<struct-type type-name='adventurest'>
<enum base-type='int16_t' name='menu' type-name='ui_advmode_menu'/>

Expand All @@ -506,6 +543,8 @@
<stl-string name='message' comment='bay12: travel_exception; you must move from surrounding obstacles'/>
<int16_t name='message_color' comment='bay12: travel_exception_color'/>
<int8_t name='message_brightness' comment='bay12: travel_exception_bright'/>
<enum name='travel_exception_type' type-name='adventure_travel_exception_type'/>
<int32_t name='travel_exception_id'/>

<int8_t name='travel_not_moved' comment='bay12: still_local'/>
<int8_t name='local_sleep_origination'/>
Expand Down Expand Up @@ -590,11 +629,32 @@

<bitfield name='chosen_flags' base-type='uint32_t'> bay12: ADVENTURE_CHOSEN_FLAG_*
<flag-bit name='did_deity_start_talk'/>
<flag-bit name='did_exit_castle_advice'/>
<flag-bit name='initial_temple_follow_compass_advice'/>
<flag-bit name='temple_talk_have_talked_to_priest'/>
<flag-bit name='temple_talk_have_taught_how_to_talk'/>
<flag-bit name='get_to_quest_first_log_advice'/>
<flag-bit name='get_to_quest_highlight_start_travel'/>
<flag-bit name='get_to_quest_highlight_end_travel'/>
<flag-bit name='on_quest_follow_compass_advice'/>
<flag-bit name='on_quest_combat_warning_advice'/>
<flag-bit name='on_quest_have_item_congratulations'/>
<flag-bit name='finish_quest_find_return_location_advice'/>
<flag-bit name='finish_quest_at_temple_with_item_advice'/>
<flag-bit name='finish_quest_success'/>
<flag-bit name='finish_quest_wrong_religion'/>
<flag-bit name='finish_quest_wrong_deity'/>
<flag-bit name='did_popup_check'/>
<flag-bit name='finish_quest_announced_success'/>
<flag-bit name='finish_quest_announced_wrong_religion'/>
<flag-bit name='finish_quest_announced_wrong_deity'/>
<flag-bit name='chosen_quest_completed'/>
</bitfield>
<int32_t name='chosen_deity_hfid' ref-target='historical_figure'/>
<int32_t name='chosen_religion_enid' ref-target='historical_entity'/>
<int32_t name='chosen_temple_stid' ref-target='world_site'/>
<int32_t name='chosen_temple_abid' ref-target='abstract_building'/>
<int32_t name='chosen_priest_hfid' ref-target='historical_figure'/>

<compound name='rumor_info'> bay12: adventure_rumor_infost
<stl-vector name='base_data' pointer-type='adventure_rumor_datast' since='v0.44.10'/>
Expand Down Expand Up @@ -783,18 +843,7 @@

<compound name='sound_indicator'> bay12: sound_indicator_handlerst
<static-array count='100' name='indicators'>
<enum name='type' base-type='int32_t'> bay12: SoundIndicatorType
<enum-item name='NONE' value='-1'/>
<enum-item name='MOVEMENT'/>
<enum-item name='COMBAT'/>
<enum-item name='VOCALIZATION'/>
<enum-item name='GRINDING_MECHANISM'/>
<enum-item name='STORYTELLING'/>
<enum-item name='POEM_RECITATION'/>
<enum-item name='MUSICAL_VOICE'/>
<enum-item name='DANCING'/>
<enum-item name='PREACHING'/>
</enum>
<enum name='type' type-name='sound_indicator_type'/>
<compound name='true_pos' type-name='coord'/>
<compound name='disp_pos' type-name='coord'/>
<int16_t name='size'/>
Expand Down Expand Up @@ -1321,6 +1370,7 @@
<class-type type-name='adventure_movement_pathst' inherits-from='adventure_movement_optionst'>
<int16_t name='vpz'/>
<bool name='is_acrobatic'/>
<bool name='is_down_through_hatch'/>
</class-type>

<class-type type-name='adventure_movement_stop_lead_animalst' inherits-from='adventure_movement_optionst'>
Expand Down
43 changes: 40 additions & 3 deletions df.ui-menus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,14 @@
<enum-item name='ADVENTURE_POPUP_SHOOT'/>
<enum-item name='ADVENTURE_POPUP_TRAVEL'/>
<enum-item name='ADVENTURE_POPUP_SLEEP_REST'/>
<enum-item name='ADVENTURE_GUIDE_SURVIVAL'/>
<enum-item name='ADVENTURE_GUIDE_COMBAT'/>
<enum-item name='ADVENTURE_GUIDE_THE_PARTY_AND_FOLLOWERS'/>
<enum-item name='ADVENTURE_GUIDE_CONVERSATIONS'/>
<enum-item name='ADVENTURE_GUIDE_TRADING'/>
<enum-item name='ADVENTURE_GUIDE_QUESTS_AND_REPUTATION'/>
<enum-item name='ADVENTURE_GUIDE_FORTRESS_MODE'/>
<enum-item name='ADVENTURE_GUIDE_RETIREMENT'/>
</enum-type>

<enum-type type-name='settings_tab_type' base-type='int32_t'> bay12: SettingsTabType
Expand Down Expand Up @@ -1320,6 +1328,21 @@
<int32_t name="ranking"/>
</struct-type>

<enum-type type-name='memory_map_type' base-type='int32_t'> bay12: MemoryMapType
<enum-item name='NONE' value='-1'/>
<enum-item name='MONSTER'/>
<enum-item name='ITEM'/>
<enum-item name='BUILDING'/>
<enum-item name='WALL'/>
<enum-item name='STAIR_UP'/>
<enum-item name='STAIR_DOWN'/>
<enum-item name='STAIR_UPDOWN'/>
<enum-item name='RAMP_UP'/>
<enum-item name='RAMP_DOWN'/>
<enum-item name='FLOOR'/>
<enum-item name='AIR'/>
</enum-type>

<struct-type type-name='main_interface' original-name='main_interfacest'>
<compound name='designation' since='v0.40.20'> bay12: designation_interfacest
<bool name='marker_only'/>
Expand Down Expand Up @@ -2949,9 +2972,6 @@

<compound name='journal_outliner'> bay12: adventure_interface_journal_outlinerst
<stl-vector name='agreement_entry' pointer-type='agreement_entryst'/>
<bitfield base-type='uint32_t' name='flag'> bay12: ADVENTURE_INTERFACE_JOURNAL_OUTLINER_FLAG_*
<flag-bit name='hidden'/>
</bitfield>
</compound>

<bitfield base-type='uint64_t' name='must_renew_adv_env_hover_flag'> bay12: MUST_RENEW_ADV_ENV_HOVER_FLAG_*
Expand Down Expand Up @@ -3499,6 +3519,9 @@
<enum-item name='Water'/>
<enum-item name='Magma'/>
<enum-item name='Spoor'/>
<enum-item name='Sound'/>
<enum-item name='MemoryMap'/>
<enum-item name='ExtraSense'/>
</enum>
<compound is-union='true' name='data'>
<compound name='item'> bay12: lookinfo_itemst
Expand Down Expand Up @@ -3566,6 +3589,20 @@
<int32_t name='id2'/>
<int32_t name='id3'/>
</compound>
<compound name='sound'> bay12: lookinfo_soundst
<enum name='type' type-name='sound_indicator_type'/>
<int16_t name='size'/>
<int32_t name='timer'/>
</compound>
<compound name='memory_map'> bay12: lookinfo_memory_mapst
<enum name='type' type-name='memory_map_type'/>
</compound>
<compound name='extra_sense'> bay12: lookinfo_extra_sensest
<uint8_t name='sense_tile'/>
<int16_t name='sense_f'/>
<int16_t name='sense_b'/>
<int16_t name='sense_br'/>
</compound>
</compound>
<compound type-name='coord' name='pos'/>
<stl-string name='display_str'/>
Expand Down
17 changes: 15 additions & 2 deletions df.viewscreen.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@
<stl-vector name='key_word' pointer-type='stl-string'/>

<stl-string name='p_list_name'/>
<compound name='p_list_box' type-name='curses_text_boxst'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>

<int32_t name='ax' init-value='-1'/>
Expand Down Expand Up @@ -1196,10 +1197,18 @@
</enum>
</class-type>

<struct-type type-name='sound_loaderst'>
<stl-string name='file'/>
<int32_t name='enum_member'/>
<bool name='is_sound'/>
<bool name='loops'/>
</struct-type>

<class-type type-name='viewscreen_initial_prepst' inherits-from='viewscreen'>
<int32_t name='render_count'/>
<int32_t name='logic_step'/>
<stl-future name='process'/>
<stl-vector type-name='sound_loaderst' name='to_load'/>
<int32_t name='initial_load_size'/>
<bool name='has_loaded'/>
</class-type>

<class-type type-name='world_gen_param_basest'>
Expand Down Expand Up @@ -2044,6 +2053,8 @@

<int32_t name='chosen_race'/>
<bool name='chosen_is_from_wilderpop_or_feature'/>
<compound name='race_desc' type-name='curses_text_boxst'/>
<int32_t name='race_desc_index'/>
<int32_t name='sheet_page'/>

<stl-vector type-name='int32_t' name='valid_race'/>
Expand All @@ -2069,6 +2080,7 @@

<stl-vector pointer-type='setup_character_info' name='csheet'/>
<int32_t name='active_sheet_index'/>
<stl-vector type-name='int32_t' name='item_tab_order'/>

<stl-vector type-name='int32_t' name='final_start_site_id_cand'/>
<int32_t name='selected_final_start_site_index'/>
Expand Down Expand Up @@ -2292,6 +2304,7 @@
<flag-bit name='show_cliffs'/>
<flag-bit name='show_elevation'/>
<flag-bit name='triple_zoomed'/>
<flag-bit name='show_travel_restriction_site'/>
</bitfield>
<int32_t name='relevant_id'/>
<pointer name='highlight_civ_id'><stl-vector type-name='int32_t' ref-target='historical_entity'/></pointer>
Expand Down

0 comments on commit a93e445

Please sign in to comment.