Skip to content

Commit a93e445

Browse files
myk002myk002
committed
update structures for beta28
except for texture array sizes
1 parent efd16ef commit a93e445

File tree

3 files changed

+117
-17
lines changed

3 files changed

+117
-17
lines changed

‎df.advmode.xml‎

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,43 @@
488488
<enum-item name='ZONE_LOCATION'/>
489489
</enum-type>
490490

491+
<enum-type type-name='adventure_travel_exception_type' base-type='int32_t'> bay12: AdventureTravelException
492+
<enum-item name='GENERIC'/>
493+
<enum-item name='UNDERGROUND_NO_TUNNEL'/>
494+
<enum-item name='NO_LEGAL_SITE_REALIZATION_DIRECTION'/>
495+
<enum-item name='NEAR_RIVER'/>
496+
<enum-item name='BOGEYMEN'/>
497+
<enum-item name='ENCOUNTER'/>
498+
<enum-item name='STOLEN_GOODS'/>
499+
<enum-item name='BLEEDING'/>
500+
<enum-item name='CANT_BREATHE'/>
501+
<enum-item name='THIRST'/>
502+
<enum-item name='HUNGER'/>
503+
<enum-item name='DROWNING'/>
504+
<enum-item name='SWIMMING'/>
505+
<enum-item name='IN_AIR'/>
506+
<enum-item name='WATER_BIOME'/>
507+
<enum-item name='MOUNTAIN_BIOME'/>
508+
<enum-item name='ON_VEHICLE'/>
509+
<enum-item name='ON_PROJECTILE'/>
510+
<enum-item name='MUST_LEAVE_SITE'/>
511+
<enum-item name='NUM'/>
512+
<enum-item name='NONE'/> NOT -1
513+
</enum-type>
514+
515+
<enum-type type-name='sound_indicator_type' base-type='int32_t'> bay12: SoundIndicatorType
516+
<enum-item name='NONE' value='-1'/>
517+
<enum-item name='MOVEMENT'/>
518+
<enum-item name='COMBAT'/>
519+
<enum-item name='VOCALIZATION'/>
520+
<enum-item name='GRINDING_MECHANISM'/>
521+
<enum-item name='STORYTELLING'/>
522+
<enum-item name='POEM_RECITATION'/>
523+
<enum-item name='MUSICAL_VOICE'/>
524+
<enum-item name='DANCING'/>
525+
<enum-item name='PREACHING'/>
526+
</enum-type>
527+
491528
<struct-type type-name='adventurest'>
492529
<enum base-type='int16_t' name='menu' type-name='ui_advmode_menu'/>
493530

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

510549
<int8_t name='travel_not_moved' comment='bay12: still_local'/>
511550
<int8_t name='local_sleep_origination'/>
@@ -590,11 +629,32 @@
590629

591630
<bitfield name='chosen_flags' base-type='uint32_t'> bay12: ADVENTURE_CHOSEN_FLAG_*
592631
<flag-bit name='did_deity_start_talk'/>
632+
<flag-bit name='did_exit_castle_advice'/>
633+
<flag-bit name='initial_temple_follow_compass_advice'/>
634+
<flag-bit name='temple_talk_have_talked_to_priest'/>
635+
<flag-bit name='temple_talk_have_taught_how_to_talk'/>
636+
<flag-bit name='get_to_quest_first_log_advice'/>
637+
<flag-bit name='get_to_quest_highlight_start_travel'/>
638+
<flag-bit name='get_to_quest_highlight_end_travel'/>
639+
<flag-bit name='on_quest_follow_compass_advice'/>
640+
<flag-bit name='on_quest_combat_warning_advice'/>
641+
<flag-bit name='on_quest_have_item_congratulations'/>
642+
<flag-bit name='finish_quest_find_return_location_advice'/>
643+
<flag-bit name='finish_quest_at_temple_with_item_advice'/>
644+
<flag-bit name='finish_quest_success'/>
645+
<flag-bit name='finish_quest_wrong_religion'/>
646+
<flag-bit name='finish_quest_wrong_deity'/>
647+
<flag-bit name='did_popup_check'/>
648+
<flag-bit name='finish_quest_announced_success'/>
649+
<flag-bit name='finish_quest_announced_wrong_religion'/>
650+
<flag-bit name='finish_quest_announced_wrong_deity'/>
651+
<flag-bit name='chosen_quest_completed'/>
593652
</bitfield>
594653
<int32_t name='chosen_deity_hfid' ref-target='historical_figure'/>
595654
<int32_t name='chosen_religion_enid' ref-target='historical_entity'/>
596655
<int32_t name='chosen_temple_stid' ref-target='world_site'/>
597656
<int32_t name='chosen_temple_abid' ref-target='abstract_building'/>
657+
<int32_t name='chosen_priest_hfid' ref-target='historical_figure'/>
598658

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

784844
<compound name='sound_indicator'> bay12: sound_indicator_handlerst
785845
<static-array count='100' name='indicators'>
786-
<enum name='type' base-type='int32_t'> bay12: SoundIndicatorType
787-
<enum-item name='NONE' value='-1'/>
788-
<enum-item name='MOVEMENT'/>
789-
<enum-item name='COMBAT'/>
790-
<enum-item name='VOCALIZATION'/>
791-
<enum-item name='GRINDING_MECHANISM'/>
792-
<enum-item name='STORYTELLING'/>
793-
<enum-item name='POEM_RECITATION'/>
794-
<enum-item name='MUSICAL_VOICE'/>
795-
<enum-item name='DANCING'/>
796-
<enum-item name='PREACHING'/>
797-
</enum>
846+
<enum name='type' type-name='sound_indicator_type'/>
798847
<compound name='true_pos' type-name='coord'/>
799848
<compound name='disp_pos' type-name='coord'/>
800849
<int16_t name='size'/>
@@ -1321,6 +1370,7 @@
13211370
<class-type type-name='adventure_movement_pathst' inherits-from='adventure_movement_optionst'>
13221371
<int16_t name='vpz'/>
13231372
<bool name='is_acrobatic'/>
1373+
<bool name='is_down_through_hatch'/>
13241374
</class-type>
13251375

13261376
<class-type type-name='adventure_movement_stop_lead_animalst' inherits-from='adventure_movement_optionst'>

‎df.ui-menus.xml‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,14 @@
770770
<enum-item name='ADVENTURE_POPUP_SHOOT'/>
771771
<enum-item name='ADVENTURE_POPUP_TRAVEL'/>
772772
<enum-item name='ADVENTURE_POPUP_SLEEP_REST'/>
773+
<enum-item name='ADVENTURE_GUIDE_SURVIVAL'/>
774+
<enum-item name='ADVENTURE_GUIDE_COMBAT'/>
775+
<enum-item name='ADVENTURE_GUIDE_THE_PARTY_AND_FOLLOWERS'/>
776+
<enum-item name='ADVENTURE_GUIDE_CONVERSATIONS'/>
777+
<enum-item name='ADVENTURE_GUIDE_TRADING'/>
778+
<enum-item name='ADVENTURE_GUIDE_QUESTS_AND_REPUTATION'/>
779+
<enum-item name='ADVENTURE_GUIDE_FORTRESS_MODE'/>
780+
<enum-item name='ADVENTURE_GUIDE_RETIREMENT'/>
773781
</enum-type>
774782

775783
<enum-type type-name='settings_tab_type' base-type='int32_t'> bay12: SettingsTabType
@@ -1320,6 +1328,21 @@
13201328
<int32_t name="ranking"/>
13211329
</struct-type>
13221330

1331+
<enum-type type-name='memory_map_type' base-type='int32_t'> bay12: MemoryMapType
1332+
<enum-item name='NONE' value='-1'/>
1333+
<enum-item name='MONSTER'/>
1334+
<enum-item name='ITEM'/>
1335+
<enum-item name='BUILDING'/>
1336+
<enum-item name='WALL'/>
1337+
<enum-item name='STAIR_UP'/>
1338+
<enum-item name='STAIR_DOWN'/>
1339+
<enum-item name='STAIR_UPDOWN'/>
1340+
<enum-item name='RAMP_UP'/>
1341+
<enum-item name='RAMP_DOWN'/>
1342+
<enum-item name='FLOOR'/>
1343+
<enum-item name='AIR'/>
1344+
</enum-type>
1345+
13231346
<struct-type type-name='main_interface' original-name='main_interfacest'>
13241347
<compound name='designation' since='v0.40.20'> bay12: designation_interfacest
13251348
<bool name='marker_only'/>
@@ -2949,9 +2972,6 @@
29492972

29502973
<compound name='journal_outliner'> bay12: adventure_interface_journal_outlinerst
29512974
<stl-vector name='agreement_entry' pointer-type='agreement_entryst'/>
2952-
<bitfield base-type='uint32_t' name='flag'> bay12: ADVENTURE_INTERFACE_JOURNAL_OUTLINER_FLAG_*
2953-
<flag-bit name='hidden'/>
2954-
</bitfield>
29552975
</compound>
29562976

29572977
<bitfield base-type='uint64_t' name='must_renew_adv_env_hover_flag'> bay12: MUST_RENEW_ADV_ENV_HOVER_FLAG_*
@@ -3499,6 +3519,9 @@
34993519
<enum-item name='Water'/>
35003520
<enum-item name='Magma'/>
35013521
<enum-item name='Spoor'/>
3522+
<enum-item name='Sound'/>
3523+
<enum-item name='MemoryMap'/>
3524+
<enum-item name='ExtraSense'/>
35023525
</enum>
35033526
<compound is-union='true' name='data'>
35043527
<compound name='item'> bay12: lookinfo_itemst
@@ -3566,6 +3589,20 @@
35663589
<int32_t name='id2'/>
35673590
<int32_t name='id3'/>
35683591
</compound>
3592+
<compound name='sound'> bay12: lookinfo_soundst
3593+
<enum name='type' type-name='sound_indicator_type'/>
3594+
<int16_t name='size'/>
3595+
<int32_t name='timer'/>
3596+
</compound>
3597+
<compound name='memory_map'> bay12: lookinfo_memory_mapst
3598+
<enum name='type' type-name='memory_map_type'/>
3599+
</compound>
3600+
<compound name='extra_sense'> bay12: lookinfo_extra_sensest
3601+
<uint8_t name='sense_tile'/>
3602+
<int16_t name='sense_f'/>
3603+
<int16_t name='sense_b'/>
3604+
<int16_t name='sense_br'/>
3605+
</compound>
35693606
</compound>
35703607
<compound type-name='coord' name='pos'/>
35713608
<stl-string name='display_str'/>

‎df.viewscreen.xml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,7 @@
912912
<stl-vector name='key_word' pointer-type='stl-string'/>
913913

914914
<stl-string name='p_list_name'/>
915+
<compound name='p_list_box' type-name='curses_text_boxst'/>
915916
<compound name='main_text_box' type-name='curses_text_boxst'/>
916917

917918
<int32_t name='ax' init-value='-1'/>
@@ -1196,10 +1197,18 @@
11961197
</enum>
11971198
</class-type>
11981199

1200+
<struct-type type-name='sound_loaderst'>
1201+
<stl-string name='file'/>
1202+
<int32_t name='enum_member'/>
1203+
<bool name='is_sound'/>
1204+
<bool name='loops'/>
1205+
</struct-type>
1206+
11991207
<class-type type-name='viewscreen_initial_prepst' inherits-from='viewscreen'>
12001208
<int32_t name='render_count'/>
1201-
<int32_t name='logic_step'/>
1202-
<stl-future name='process'/>
1209+
<stl-vector type-name='sound_loaderst' name='to_load'/>
1210+
<int32_t name='initial_load_size'/>
1211+
<bool name='has_loaded'/>
12031212
</class-type>
12041213

12051214
<class-type type-name='world_gen_param_basest'>
@@ -2044,6 +2053,8 @@
20442053

20452054
<int32_t name='chosen_race'/>
20462055
<bool name='chosen_is_from_wilderpop_or_feature'/>
2056+
<compound name='race_desc' type-name='curses_text_boxst'/>
2057+
<int32_t name='race_desc_index'/>
20472058
<int32_t name='sheet_page'/>
20482059

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

20702081
<stl-vector pointer-type='setup_character_info' name='csheet'/>
20712082
<int32_t name='active_sheet_index'/>
2083+
<stl-vector type-name='int32_t' name='item_tab_order'/>
20722084

20732085
<stl-vector type-name='int32_t' name='final_start_site_id_cand'/>
20742086
<int32_t name='selected_final_start_site_index'/>
@@ -2292,6 +2304,7 @@
22922304
<flag-bit name='show_cliffs'/>
22932305
<flag-bit name='show_elevation'/>
22942306
<flag-bit name='triple_zoomed'/>
2307+
<flag-bit name='show_travel_restriction_site'/>
22952308
</bitfield>
22962309
<int32_t name='relevant_id'/>
22972310
<pointer name='highlight_civ_id'><stl-vector type-name='int32_t' ref-target='historical_entity'/></pointer>

0 commit comments

Comments
 (0)