Skip to content

Commit e691c51

Browse files
quietustquietust
committed
51.01-beta26
1 parent 0c93e77 commit e691c51

21 files changed

+687
-279
lines changed

‎df.advmode.xml‎

Lines changed: 207 additions & 190 deletions
Large diffs are not rendered by default.

‎df.announcements.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@
10961096
<item-attr name='alert_type' value='GENERAL'/>
10971097
</enum-item>
10981098

1099-
<enum-item name='UNUSED_46'>
1099+
<enum-item name='DEITY_PRONOUNCEMENT' since='v0.51.01'>
11001100
<item-attr name='alert_type' value='GENERAL'/>
11011101
</enum-item>
11021102
<enum-item name='UNUSED_47'>
@@ -1222,6 +1222,7 @@
12221222

12231223
<int16_t name='color' init-value='7'/>
12241224
<bool name='bright' init-value='true'/>
1225+
<int32_t name='portrait_hfid' ref-target='historical_figure'/>
12251226
</struct-type>
12261227

12271228
<struct-type type-name='announcement_alertst'>
@@ -1250,6 +1251,7 @@
12501251
<bitfield base-type='uint32_t' name='flags'> bay12: ANNOUNCEMENT_INFO_FLAG_*
12511252
<flag-bit name='SPARRING_EVENT' comment='determined by unit_action_data_attack.flags.sparring_hit'/>
12521253
</bitfield>
1254+
<int32_t name='portrait_hfid' ref-target='historical_figure'/>
12531255
</struct-type>
12541256
</data-definition>
12551257

‎df.creature-raws.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@
710710
<flag-bit name='SELF_ONLY'/>
711711
</bitfield-type>
712712

713-
<struct-type type-name='creature_interaction' original-name='interaction_informationst'>
713+
<struct-type type-name='interaction_informationst'>
714714
<stl-string name='token'/>
715715
<stl-vector pointer-type='stl-string' name='bp_required_type'/>
716716
<stl-vector pointer-type='stl-string' name='bp_required_name'/>
@@ -756,7 +756,7 @@
756756
<enum-item name='CAN_DO_INTERACTION'/>
757757
<enum-item name='ROOT_AROUND'/>
758758
</enum>
759-
<compound name='interaction' type-name='creature_interaction'/>
759+
<compound name='interaction' type-name='interaction_informationst'/>
760760
</struct-type>
761761

762762
<struct-type type-name='caste_body_info' original-name='bodyst'>
@@ -1441,6 +1441,11 @@
14411441

14421442
<static-array name='layer_unitless_texpos' count='135' index-enum='profession'><static-array count='3'><static-array count='2'><stl-vector type-name='int32_t'/></static-array></static-array></static-array>
14431443
<static-array name='layer_unitless_sheet_icon_texpos' count='135' index-enum='profession'><stl-vector type-name='int32_t'/></static-array>
1444+
1445+
<int32_t name='texpos_glow'/>
1446+
<int32_t name='texpos_glow_left_gone'/>
1447+
<int32_t name='texpos_glow_right_gone'/>
1448+
<int32_t name='texpos_glow_child'/>
14441449
</struct-type>
14451450

14461451
<struct-type type-name='tissue_style_raw' key-field='id' original-name='tissue_style_unitst'>

‎df.d_init.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<enum-item name='SHOW_IMP_QUALITY'/>
2929
<enum-item name='SHOW_FLOW_AMOUNTS'/>
3030
<enum-item name='SHOW_RAMP_ARROWS'/>
31+
<enum-item name='FORT_SHOW_CLOTHING_DYES'/>
32+
<enum-item name='ADV_SHOW_CLOTHING_DYES'/>
3133
</enum-type>
3234

3335
<enum-type type-name='d_init_flags2'> bay12: InitAdventureFlagType
@@ -53,7 +55,7 @@
5355
<enum-item name='LOG_MAP_REJECTS'/>
5456
<enum-item name='PAUSE_ON_LOAD'/>
5557
<enum-item name='EMBARK_WARNING_ALWAYS'/>
56-
<enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE'/>
58+
<enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE' comment='SHOW_ALL_HISTORY_IN_FORT_MODE'/>
5759

5860
<enum-item name='TESTING_ARENA'/>
5961
<enum-item name='WALKING_SPREADS_SPATTER_DWF'/>

‎df.entities.xml‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -382,18 +382,7 @@
382382
<int32_t name='claim_year_tick' init-value='-1' comment="usually init"/>
383383
<int32_t name='renounce_event' ref-target='history_event'/>
384384

385-
<!-- <compound name='temp_arl'> --> bay12: artifact_rumor_locationst
386-
<pointer name='artifact' type-name='artifact_record'/>
387-
<int32_t name='site' ref-target='world_site'/>
388-
<int32_t name='structure_local' init-value='-1'/>
389-
<int32_t name='holder_hf' ref-target='historical_figure' comment="might be owner_hf. all cases encountered have had both field the same when claimed by entity"/>
390-
<int32_t name='subregion' ref-target='world_region'/>
391-
<int32_t name='feature_layer_id' ref-target='world_underground_region'/>
392-
<int32_t name='latest_year' init-value='-1'/>
393-
<int32_t name='latest_season_tick' init-value='-1'/>
394-
<uint32_t name='flags'/>
395-
<pointer name='witness' type-name='witness_incidentst'/>
396-
<!-- </compound> -->
385+
<compound name='temp_arl' type-name='artifact_rumor_locationst'/>
397386

398387
<pointer name='temp_site_ent' type-name='historical_entity' has-bad-pointers='true'/>
399388
<pointer name='temp_civ_ent' type-name='historical_entity' has-bad-pointers='true'/>
@@ -1486,22 +1475,24 @@
14861475
</enum-type>
14871476

14881477
<enum-type type-name='agreement_details_type' base-type='int32_t'> bay12: AgreementSubjectType
1489-
<enum-item name='JoinParty'/>
1490-
<enum-item name='DemonicBinding'/>
1491-
<enum-item name='Residency'/>
1492-
<enum-item name='Citizenship'/>
1493-
<enum-item name='Parley'/>
1478+
<enum-item name='JoinParty' comment='JOIN_AS_COMPANION'/>
1479+
<enum-item name='DemonicBinding' comment='ATTACH_TO_WORLD'/>
1480+
<enum-item name='Residency' comment='BECOME_RESIDENT'/>
1481+
<enum-item name='Citizenship' comment='BECOME_CITIZEN'/>
1482+
<enum-item name='Parley' comment='ARRANGE_PARLEY'/>
14941483
<enum-item name='PositionCorruption' comment="Embezzlement and accepting bribes seen. For own gain and for 'sponsor'"/>
14951484
<enum-item name='PlotStealArtifact'/>
14961485
<enum-item name='PromisePosition'/>
14971486
<enum-item name='PlotAssassination'/>
14981487
<enum-item name='PlotAbduct'/>
14991488
<enum-item name='PlotSabotage'/>
1500-
<enum-item name='PlotConviction'/>
1501-
<enum-item name='Location'/>
1502-
<enum-item name='PlotInfiltrationCoup'/>
1503-
<enum-item name='PlotFrameTreason'/>
1504-
<enum-item name='PlotInduceWar'/>
1489+
<enum-item name='PlotConviction' comment='FOILED_CONSPIRACY'/>
1490+
<enum-item name='Location' comment='BUILD_LOCATION'/>
1491+
<enum-item name='PlotInfiltrationCoup' comment='INFILTRATE_SOCIETY'/>
1492+
<enum-item name='PlotFrameTreason' comment='FRAME_FOR_CRIME'/>
1493+
<enum-item name='PlotInduceWar' comment='START_WAR_WITH_ENTITY'/>
1494+
<enum-item name='OfferService'/>
1495+
<enum-item name='RetrieveArtifact'/>
15051496
</enum-type>
15061497

15071498
<struct-type type-name='agreement_details' original-name='agreement_subjectst' key-field='id'>
@@ -1525,6 +1516,8 @@
15251516
<pointer name='PlotInfiltrationCoup' type-name='agreement_details_data_plot_infiltration_coup'/>
15261517
<pointer name='PlotFrameTreason' type-name='agreement_details_data_plot_frame_treason'/>
15271518
<pointer name='PlotInduceWar' type-name='agreement_details_data_plot_induce_war'/>
1519+
<pointer name='OfferService' type-name='agreement_details_data_offer_service'/>
1520+
<pointer name='RetrieveArtifact' type-name='agreement_details_data_retrieve_artifact'/>
15281521
</compound>
15291522
<enum name='type' base-type='int32_t' type-name='agreement_details_type'/>
15301523
</struct-type>
@@ -1664,6 +1657,19 @@
16641657
<int32_t name='defender' ref-target='historical_entity'/>
16651658
</struct-type>
16661659

1660+
<struct-type type-name='agreement_details_data_offer_service' original-name='agreement_subject_offer_servicest'>
1661+
<int32_t name='requesting_party' ref-target='agreement_party'/>
1662+
<int32_t name='serving_party' ref-target='agreement_party'/>
1663+
<int32_t name='served_entity' ref-target='historical_entity'/>
1664+
</struct-type>
1665+
1666+
<struct-type type-name='agreement_details_data_retrieve_artifact' original-name='agreement_subject_retrieve_artifactst'>
1667+
<int32_t name='retrieving_party' ref-target='agreement_party'/>
1668+
<int32_t name='requesting_party' ref-target='agreement_party'/>
1669+
<int32_t name='artifact' ref-target='artifact_record'/>
1670+
<int32_t name='artifact_site' ref-target='world_site'/>
1671+
<int32_t name='receiving_entity' ref-target='historical_entity'/>
1672+
</struct-type>
16671673
</data-definition>
16681674

16691675
<!--

‎df.entity-raws.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<enum-item name='AT_PEACE_WITH_WILDLIFE'/>
4949
<enum-item name='EQUIPMENT_IMPROVEMENTS'/>
5050
<enum-item name='ABUSE_BODIES'/>
51-
<enum-item comment='unused'/>
51+
<enum-item name='MYTHICAL'/>
5252
<enum-item name='GENERATED'/>
5353
<enum-item name='SKULKING'/>
5454
<enum-item name='HAS_LAND_HOLDER'/>

‎df.graphics.xml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,25 +299,25 @@
299299
<static-array type-name='long' count='1' name='black_background_texpos'/>
300300
<static-array type-name='int32_t' count='120' name='texture_indices1'/>
301301
<stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
302-
<static-array type-name='int32_t' count='10871' name='texture_indices2'/>
302+
<static-array type-name='int32_t' count='10967' name='texture_indices2'/>
303303

304304
<compound type-name='interface_setst' name='graphical_interface'/>
305305
<compound type-name='interface_setst' name='classic_interface'/>
306306

307-
<static-array type-name='int32_t' count='13760' name='texture_indices3'/>
307+
<static-array type-name='int32_t' count='13781' name='texture_indices3'/>
308308
<stl-vector type-name='int32_t' name='texpos_boulder'/>
309-
<static-array type-name='int32_t' count='3472' name='texture_indices4'/>
309+
<static-array type-name='int32_t' count='4436' name='texture_indices4'/>
310310
<static-array name='texpos_item_barrel_top' count='7'><stl-vector type-name='int32_t'/></static-array>
311311
<static-array type-name='int32_t' count='128' name='texture_indices5'/>
312312
<static-array name='texpos_item_bin_top' count='21'><stl-vector type-name='int32_t'/></static-array>
313-
<static-array type-name='int32_t' count='305' name='texture_indices6'/>
313+
<static-array type-name='int32_t' count='306' name='texture_indices6'/>
314314
<stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
315315
<static-array type-name='int32_t' count='7977' name='texture_indices7'/>
316316
<static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
317317
<static-array type-name='int32_t' count='101' name='texture_indices8'/>
318318
<static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
319-
<static-array type-name='int32_t' count='270' name='texture_indices9'/>
320-
<static-array name='texpos_map_drawn' count='70'><stl-vector type-name='int32_t'/></static-array>
319+
<static-array type-name='int32_t' count='276' name='texture_indices9'/>
320+
<static-array name='texpos_map_drawn' count='73'><stl-vector type-name='int32_t'/></static-array>
321321
<static-array type-name='int32_t' count='6845' name='texture_indices10'/>
322322
</struct-type>
323323

@@ -413,7 +413,7 @@
413413
<static-array count='5' name='texpos_short_subsubtab'><static-array type-name='int32_t' count='2'/></static-array>
414414
<static-array count='5' name='texpos_short_subsubtab_selected'><static-array type-name='int32_t' count='2'/></static-array>
415415
<int32_t name='texpos_interface_background'/>
416-
<static-array count='698' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
416+
<static-array count='706' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
417417
<static-array count='13' name='texpos_button_small'><static-array count='2'><static-array type-name='int32_t' count='2'/></static-array></static-array>
418418
<static-array count='4' name='texpos_button_horizontal_option_left_ornament'><static-array type-name='int32_t' count='3'/></static-array>
419419
<static-array count='3' name='texpos_button_horizontal_option_active'><static-array type-name='int32_t' count='3'/></static-array>
@@ -536,6 +536,20 @@
536536
<static-array count='2' name='texpos_zoom_out_on'><static-array type-name='int32_t' count='2'/></static-array>
537537
<static-array count='2' name='texpos_zoom_out_off'><static-array type-name='int32_t' count='2'/></static-array>
538538

539+
<static-array count='2' name='texpos_adv_liquid_numbers_on'><static-array type-name='int32_t' count='2'/></static-array>
540+
<static-array count='2' name='texpos_adv_liquid_numbers_off'><static-array type-name='int32_t' count='2'/></static-array>
541+
<static-array count='2' name='texpos_adv_ramp_arrows_on'><static-array type-name='int32_t' count='2'/></static-array>
542+
<static-array count='2' name='texpos_adv_ramp_arrows_off'><static-array type-name='int32_t' count='2'/></static-array>
543+
544+
<static-array count='2' name='texpos_adv_zoom_in_on'><static-array type-name='int32_t' count='2'/></static-array>
545+
<static-array count='2' name='texpos_adv_zoom_in_off'><static-array type-name='int32_t' count='2'/></static-array>
546+
<static-array count='2' name='texpos_adv_zoom_out_on'><static-array type-name='int32_t' count='2'/></static-array>
547+
<static-array count='2' name='texpos_adv_zoom_out_off'><static-array type-name='int32_t' count='2'/></static-array>
548+
<static-array count='2' name='texpos_adv_tracks_on'><static-array type-name='int32_t' count='2'/></static-array>
549+
<static-array count='2' name='texpos_adv_tracks_off'><static-array type-name='int32_t' count='2'/></static-array>
550+
551+
<static-array count='76' name='texpos_adv_env'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
552+
539553
<static-array count='3' name='texpos_legends_tab_page_left'><static-array type-name='int32_t' count='2'/></static-array>
540554
<static-array count='3' name='texpos_legends_tab_page_right'><static-array type-name='int32_t' count='2'/></static-array>
541555
<static-array type-name='int32_t' count='2' name='texpos_legends_tab_close_inactive'/>

‎df.history.xml‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,23 @@
223223
<enum-item name='ARMOR'/>
224224
</enum-type>
225225

226+
<struct-type type-name='creature_knowledgest'>
227+
<int32_t name='combined_caste_id'/>
228+
<bitfield name='flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_FLAG_*
229+
<flag-bit name='heard_of'/>
230+
<flag-bit name='old_local'/>
231+
<flag-bit name='recent_encounter'/>
232+
</bitfield>
233+
234+
<stl-vector name='site' type-name='int32_t' ref-target='world_site'/>
235+
<stl-vector name='region' type-name='int32_t' ref-target='world_region'/>
236+
<stl-vector name='layer' type-name='int32_t' ref-target='world_underground_region'/>
237+
238+
<bitfield name='scholar_flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_SCHOLAR_FLAG_*
239+
<flag-bit name='foraging_behavior'/>
240+
</bitfield>
241+
</struct-type>
242+
226243
<struct-type type-name='knowledge_profilest'>
227244
<stl-vector name='known_secrets' pointer-type='interaction' comment="bay12: interation_ptr; Interactions inflicted upon the figure through an I_SOURCE:SECRET means are recorded here; this appears to prevent the interaction from affecting the figure again on subsequent exposure (when rereading a necromancy slab, for example). For interactions with both I_SOURCE:SECRET and another source (I_SOURCE:INGESTION, for example), exposure to the interaction through the non-secret route does not result in the interaction being listed here."/>
228245
<int32_t name='next_intervention_resistance_year' init-value='-1' comment="All are gods with the DEATH sphere having created slabs, but the value isn't the id of the slab"/>
@@ -234,24 +251,7 @@
234251
<stl-vector name='heard_of_guide_hfid' type-name='int32_t'/>
235252
<stl-vector name='heard_of_stid' type-name='int32_t'/>
236253
<compound name='opinion_info' type-name='opinion_infost'/>
237-
<stl-vector name='creature_knowledge'>
238-
<pointer> bay12: creature_knowledgest
239-
<int32_t name='combined_caste_id'/>
240-
<bitfield name='flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_FLAG_*
241-
<flag-bit name='heard_of'/>
242-
<flag-bit name='old_local'/>
243-
<flag-bit name='recent_encounter'/>
244-
</bitfield>
245-
246-
<stl-vector name='site' type-name='int32_t' ref-target='world_site'/>
247-
<stl-vector name='region' type-name='int32_t' ref-target='world_region'/>
248-
<stl-vector name='layer' type-name='int32_t' ref-target='world_underground_region'/>
249-
250-
<bitfield name='scholar_flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_SCHOLAR_FLAG_*
251-
<flag-bit name='foraging_behavior'/>
252-
</bitfield>
253-
</pointer>
254-
</stl-vector>
254+
<stl-vector name='creature_knowledge' pointer-type='creature_knowledgest'/>
255255
<stl-vector name="known_poetic_forms" type-name='int32_t' ref-target='poetic_form' since='v0.42.01' comment='bay12: poetic_form_known_id'/>
256256
<stl-vector name="known_musical_forms" type-name='int32_t' ref-target='musical_form' since='v0.42.01' comment='bay12: musical_form_known_id'/>
257257
<stl-vector name="known_dance_forms" type-name='int32_t' ref-target='dance_form' since='v0.42.01' comment='bay12: dance_form_known_id'/>
@@ -300,11 +300,20 @@
300300
</struct-type>
301301

302302
<struct-type type-name='historical_figure_info' original-name='hf_profilest'>
303-
<pointer name="spheres"> bay12: metaphysical_profilest
303+
<pointer name="metaphysical"> bay12: metaphysical_profilest
304304
<stl-vector name="spheres">
305305
<enum base-type='int16_t' type-name='sphere_type'/>
306306
</stl-vector>
307307
<stl-vector name='associated_divination_set_id' type-name='int32_t' ref-target='divination_set' since='v0.47.01'/>
308+
<pointer name='appearance_pform' type-name='unit_appearance'/>
309+
<int32_t name='physical_form_strength'/>
310+
<int32_t name='physical_form_recuperation'/>
311+
<int32_t name='physical_form_age_days'/>
312+
<int32_t name='physical_form_seed'/>
313+
<int32_t name='related_civ_enid' ref-target='historical_entity'/>
314+
315+
<int32_t name='physical_form_portrait_texpos' comment='not saved'/>
316+
<bool name='need_to_update_physical_form_portrait'/>
308317
</pointer>
309318

310319
<pointer name="skills"> bay12: skill_profilest
@@ -432,6 +441,7 @@
432441
<bitfield name='flags' base-type='uint32_t' since='v0.44.06'> bay12: INVENTORY_PROFILE_FLAG_*
433442
<flag-bit name='specific_items'/>
434443
<flag-bit name='use_average_equipment_quality'/>
444+
<flag-bit name='use_mythical_substances'/>
435445
</bitfield>
436446
<enum name='using_weapon_skill' type-name='job_skill' since='v0.44.06' comment='not saved'/>
437447
<pointer name='building_usage_profile' since='v0.47.01'> bay12: hf_building_usage_profilest
@@ -1662,6 +1672,7 @@
16621672
<enum-item name='priest_cry'>
16631673
<item-attr name='caption' value='to cry on a priest'/>
16641674
</enum-item>
1675+
<enum-item name='success'/>
16651676
</enum-type>
16661677

16671678
<struct-type type-name='history_event_reason_info'> not an actual structure

‎df.init.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,13 @@
5555
<struct-type type-name='init_media'>
5656
<df-flagarray name='flag' index-enum='init_media_flags'/>
5757
<int32_t name='volume_master'/>
58-
<int32_t name='volume_music'/>
59-
<int32_t name='volume_ambience'/>
60-
<int32_t name='volume_sfx'/>
61-
<int32_t name='time_between_songs'/>
58+
<int32_t name='volume_music_fort'/>
59+
<int32_t name='volume_ambience_fort'/>
60+
<int32_t name='volume_sfx_fort'/>
61+
<int32_t name='time_between_songs_fort'/>
62+
<int32_t name='volume_music_adv'/>
63+
<int32_t name='volume_ambience_adv'/>
64+
<int32_t name='volume_sfx_adv'/>
6265
</struct-type>
6366

6467
<enum-type type-name='init_input_flags'>

0 commit comments

Comments
 (0)