51.01-beta26

quietust · Nov 27, 2024 · e691c51 · e691c51
1 parent 0c93e77
commit e691c51
Show file tree

Hide file tree

Showing 21 changed files with 687 additions and 279 deletions.
diff --git a/df.advmode.xml b/df.advmode.xml
diff --git a/df.announcements.xml b/df.announcements.xml
@@ -1096,7 +1096,7 @@
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
 
-        <enum-item name='UNUSED_46'>
+        <enum-item name='DEITY_PRONOUNCEMENT' since='v0.51.01'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
         <enum-item name='UNUSED_47'>
@@ -1222,6 +1222,7 @@
 
         <int16_t name='color' init-value='7'/>
         <bool name='bright' init-value='true'/>
+        <int32_t name='portrait_hfid' ref-target='historical_figure'/>
     </struct-type>
 
     <struct-type type-name='announcement_alertst'>
@@ -1250,6 +1251,7 @@
         <bitfield base-type='uint32_t' name='flags'> bay12: ANNOUNCEMENT_INFO_FLAG_*
             <flag-bit name='SPARRING_EVENT' comment='determined by unit_action_data_attack.flags.sparring_hit'/>
         </bitfield>
+        <int32_t name='portrait_hfid' ref-target='historical_figure'/>
     </struct-type>
 </data-definition>
 

diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -710,7 +710,7 @@
         <flag-bit name='SELF_ONLY'/>
     </bitfield-type>
 
-    <struct-type type-name='creature_interaction' original-name='interaction_informationst'>
+    <struct-type type-name='interaction_informationst'>
         <stl-string name='token'/>
         <stl-vector pointer-type='stl-string' name='bp_required_type'/>
         <stl-vector pointer-type='stl-string' name='bp_required_name'/>
@@ -756,7 +756,7 @@
             <enum-item name='CAN_DO_INTERACTION'/>
             <enum-item name='ROOT_AROUND'/>
         </enum>
-        <compound name='interaction' type-name='creature_interaction'/>
+        <compound name='interaction' type-name='interaction_informationst'/>
     </struct-type>
 
     <struct-type type-name='caste_body_info' original-name='bodyst'>
@@ -1441,6 +1441,11 @@
 
         <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>
         <static-array name='layer_unitless_sheet_icon_texpos' count='135' index-enum='profession'><stl-vector type-name='int32_t'/></static-array>
+
+        <int32_t name='texpos_glow'/>
+        <int32_t name='texpos_glow_left_gone'/>
+        <int32_t name='texpos_glow_right_gone'/>
+        <int32_t name='texpos_glow_child'/>
     </struct-type>
 
     <struct-type type-name='tissue_style_raw' key-field='id' original-name='tissue_style_unitst'>

diff --git a/df.d_init.xml b/df.d_init.xml
@@ -28,6 +28,8 @@
         <enum-item name='SHOW_IMP_QUALITY'/>
         <enum-item name='SHOW_FLOW_AMOUNTS'/>
         <enum-item name='SHOW_RAMP_ARROWS'/>
+        <enum-item name='FORT_SHOW_CLOTHING_DYES'/>
+        <enum-item name='ADV_SHOW_CLOTHING_DYES'/>
     </enum-type>
 
     <enum-type type-name='d_init_flags2'> bay12: InitAdventureFlagType
@@ -53,7 +55,7 @@
         <enum-item name='LOG_MAP_REJECTS'/>
         <enum-item name='PAUSE_ON_LOAD'/>
         <enum-item name='EMBARK_WARNING_ALWAYS'/>
-        <enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE'/>
+        <enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE' comment='SHOW_ALL_HISTORY_IN_FORT_MODE'/>
 
         <enum-item name='TESTING_ARENA'/>
         <enum-item name='WALKING_SPREADS_SPATTER_DWF'/>

diff --git a/df.entities.xml b/df.entities.xml
@@ -382,18 +382,7 @@
         <int32_t name='claim_year_tick' init-value='-1' comment="usually init"/>
         <int32_t name='renounce_event' ref-target='history_event'/>
 
-        <!-- <compound name='temp_arl'> --> bay12: artifact_rumor_locationst
-        <pointer name='artifact' type-name='artifact_record'/>
-        <int32_t name='site' ref-target='world_site'/>
-        <int32_t name='structure_local' init-value='-1'/>
-        <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"/>
-        <int32_t name='subregion' ref-target='world_region'/>
-        <int32_t name='feature_layer_id' ref-target='world_underground_region'/>
-        <int32_t name='latest_year' init-value='-1'/>
-        <int32_t name='latest_season_tick' init-value='-1'/>
-        <uint32_t name='flags'/>
-        <pointer name='witness' type-name='witness_incidentst'/>
-        <!-- </compound> -->
+        <compound name='temp_arl' type-name='artifact_rumor_locationst'/>
 
         <pointer name='temp_site_ent' type-name='historical_entity' has-bad-pointers='true'/>
         <pointer name='temp_civ_ent' type-name='historical_entity' has-bad-pointers='true'/>
@@ -1486,22 +1475,24 @@
     </enum-type>
 
     <enum-type type-name='agreement_details_type' base-type='int32_t'> bay12: AgreementSubjectType
-        <enum-item name='JoinParty'/>
-        <enum-item name='DemonicBinding'/>
-        <enum-item name='Residency'/>
-        <enum-item name='Citizenship'/>
-        <enum-item name='Parley'/>
+        <enum-item name='JoinParty' comment='JOIN_AS_COMPANION'/>
+        <enum-item name='DemonicBinding' comment='ATTACH_TO_WORLD'/>
+        <enum-item name='Residency' comment='BECOME_RESIDENT'/>
+        <enum-item name='Citizenship' comment='BECOME_CITIZEN'/>
+        <enum-item name='Parley' comment='ARRANGE_PARLEY'/>
         <enum-item name='PositionCorruption' comment="Embezzlement and accepting bribes seen. For own gain and for 'sponsor'"/>
         <enum-item name='PlotStealArtifact'/>
         <enum-item name='PromisePosition'/>
         <enum-item name='PlotAssassination'/>
         <enum-item name='PlotAbduct'/>
         <enum-item name='PlotSabotage'/>
-        <enum-item name='PlotConviction'/>
-        <enum-item name='Location'/>
-        <enum-item name='PlotInfiltrationCoup'/>
-        <enum-item name='PlotFrameTreason'/>
-        <enum-item name='PlotInduceWar'/>
+        <enum-item name='PlotConviction' comment='FOILED_CONSPIRACY'/>
+        <enum-item name='Location' comment='BUILD_LOCATION'/>
+        <enum-item name='PlotInfiltrationCoup' comment='INFILTRATE_SOCIETY'/>
+        <enum-item name='PlotFrameTreason' comment='FRAME_FOR_CRIME'/>
+        <enum-item name='PlotInduceWar' comment='START_WAR_WITH_ENTITY'/>
+        <enum-item name='OfferService'/>
+        <enum-item name='RetrieveArtifact'/>
     </enum-type>
 
     <struct-type type-name='agreement_details' original-name='agreement_subjectst' key-field='id'>
@@ -1525,6 +1516,8 @@
             <pointer name='PlotInfiltrationCoup' type-name='agreement_details_data_plot_infiltration_coup'/>
             <pointer name='PlotFrameTreason' type-name='agreement_details_data_plot_frame_treason'/>
             <pointer name='PlotInduceWar' type-name='agreement_details_data_plot_induce_war'/>
+            <pointer name='OfferService' type-name='agreement_details_data_offer_service'/>
+            <pointer name='RetrieveArtifact' type-name='agreement_details_data_retrieve_artifact'/>
         </compound>
         <enum name='type' base-type='int32_t' type-name='agreement_details_type'/>
     </struct-type>
@@ -1664,6 +1657,19 @@
         <int32_t name='defender' ref-target='historical_entity'/>
     </struct-type>
 
+    <struct-type type-name='agreement_details_data_offer_service' original-name='agreement_subject_offer_servicest'>
+        <int32_t name='requesting_party' ref-target='agreement_party'/>
+        <int32_t name='serving_party' ref-target='agreement_party'/>
+        <int32_t name='served_entity' ref-target='historical_entity'/>
+    </struct-type>
+
+    <struct-type type-name='agreement_details_data_retrieve_artifact' original-name='agreement_subject_retrieve_artifactst'>
+        <int32_t name='retrieving_party' ref-target='agreement_party'/>
+        <int32_t name='requesting_party' ref-target='agreement_party'/>
+        <int32_t name='artifact' ref-target='artifact_record'/>
+        <int32_t name='artifact_site' ref-target='world_site'/>
+        <int32_t name='receiving_entity' ref-target='historical_entity'/>
+    </struct-type>
 </data-definition>
 
 <!--

diff --git a/df.entity-raws.xml b/df.entity-raws.xml
@@ -48,7 +48,7 @@
         <enum-item name='AT_PEACE_WITH_WILDLIFE'/>
         <enum-item name='EQUIPMENT_IMPROVEMENTS'/>
         <enum-item name='ABUSE_BODIES'/>
-        <enum-item comment='unused'/>
+        <enum-item name='MYTHICAL'/>
         <enum-item name='GENERATED'/>
         <enum-item name='SKULKING'/>
         <enum-item name='HAS_LAND_HOLDER'/>

diff --git a/df.graphics.xml b/df.graphics.xml
@@ -299,25 +299,25 @@
         <static-array type-name='long' count='1' name='black_background_texpos'/>
         <static-array type-name='int32_t' count='120' name='texture_indices1'/>
         <stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
-        <static-array type-name='int32_t' count='10871' name='texture_indices2'/>
+        <static-array type-name='int32_t' count='10967' name='texture_indices2'/>
 
         <compound type-name='interface_setst' name='graphical_interface'/>
         <compound type-name='interface_setst' name='classic_interface'/>
 
-        <static-array type-name='int32_t' count='13760' name='texture_indices3'/>
+        <static-array type-name='int32_t' count='13781' name='texture_indices3'/>
         <stl-vector type-name='int32_t' name='texpos_boulder'/>
-        <static-array type-name='int32_t' count='3472' name='texture_indices4'/>
+        <static-array type-name='int32_t' count='4436' name='texture_indices4'/>
         <static-array name='texpos_item_barrel_top' count='7'><stl-vector type-name='int32_t'/></static-array>
         <static-array type-name='int32_t' count='128' name='texture_indices5'/>
         <static-array name='texpos_item_bin_top' count='21'><stl-vector type-name='int32_t'/></static-array>
-        <static-array type-name='int32_t' count='305' name='texture_indices6'/>
+        <static-array type-name='int32_t' count='306' name='texture_indices6'/>
         <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
         <static-array type-name='int32_t' count='7977' name='texture_indices7'/>
         <static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
         <static-array type-name='int32_t' count='101' name='texture_indices8'/>
         <static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
-        <static-array type-name='int32_t' count='270' name='texture_indices9'/>
-        <static-array name='texpos_map_drawn' count='70'><stl-vector type-name='int32_t'/></static-array>
+        <static-array type-name='int32_t' count='276' name='texture_indices9'/>
+        <static-array name='texpos_map_drawn' count='73'><stl-vector type-name='int32_t'/></static-array>
         <static-array type-name='int32_t' count='6845' name='texture_indices10'/>
     </struct-type>
 
@@ -413,7 +413,7 @@
         <static-array count='5' name='texpos_short_subsubtab'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='5' name='texpos_short_subsubtab_selected'><static-array type-name='int32_t' count='2'/></static-array>
         <int32_t name='texpos_interface_background'/>
-        <static-array count='698' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+        <static-array count='706' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
         <static-array count='13' name='texpos_button_small'><static-array count='2'><static-array type-name='int32_t' count='2'/></static-array></static-array>
         <static-array count='4' name='texpos_button_horizontal_option_left_ornament'><static-array type-name='int32_t' count='3'/></static-array>
         <static-array count='3' name='texpos_button_horizontal_option_active'><static-array type-name='int32_t' count='3'/></static-array>
@@ -536,6 +536,20 @@
         <static-array count='2' name='texpos_zoom_out_on'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='2' name='texpos_zoom_out_off'><static-array type-name='int32_t' count='2'/></static-array>
 
+        <static-array count='2' name='texpos_adv_liquid_numbers_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_liquid_numbers_off'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_ramp_arrows_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_ramp_arrows_off'><static-array type-name='int32_t' count='2'/></static-array>
+
+        <static-array count='2' name='texpos_adv_zoom_in_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_zoom_in_off'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_zoom_out_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_zoom_out_off'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_tracks_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_tracks_off'><static-array type-name='int32_t' count='2'/></static-array>
+
+        <static-array count='76' name='texpos_adv_env'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+
         <static-array count='3' name='texpos_legends_tab_page_left'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='3' name='texpos_legends_tab_page_right'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array type-name='int32_t' count='2' name='texpos_legends_tab_close_inactive'/>

diff --git a/df.history.xml b/df.history.xml
@@ -223,6 +223,23 @@
         <enum-item name='ARMOR'/>
     </enum-type>
 
+    <struct-type type-name='creature_knowledgest'>
+        <int32_t name='combined_caste_id'/>
+        <bitfield name='flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_FLAG_*
+            <flag-bit name='heard_of'/>
+            <flag-bit name='old_local'/>
+            <flag-bit name='recent_encounter'/>
+        </bitfield>
+
+        <stl-vector name='site' type-name='int32_t' ref-target='world_site'/>
+        <stl-vector name='region' type-name='int32_t' ref-target='world_region'/>
+        <stl-vector name='layer' type-name='int32_t' ref-target='world_underground_region'/>
+
+        <bitfield name='scholar_flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_SCHOLAR_FLAG_*
+            <flag-bit name='foraging_behavior'/>
+        </bitfield>
+    </struct-type>
+
     <struct-type type-name='knowledge_profilest'>
         <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."/>
         <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 @@
         <stl-vector name='heard_of_guide_hfid' type-name='int32_t'/>
         <stl-vector name='heard_of_stid' type-name='int32_t'/>
         <compound name='opinion_info' type-name='opinion_infost'/>
-        <stl-vector name='creature_knowledge'>
-            <pointer> bay12: creature_knowledgest
-                <int32_t name='combined_caste_id'/>
-                <bitfield name='flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_FLAG_*
-                    <flag-bit name='heard_of'/>
-                    <flag-bit name='old_local'/>
-                    <flag-bit name='recent_encounter'/>
-                </bitfield>
-
-                <stl-vector name='site' type-name='int32_t' ref-target='world_site'/>
-                <stl-vector name='region' type-name='int32_t' ref-target='world_region'/>
-                <stl-vector name='layer' type-name='int32_t' ref-target='world_underground_region'/>
-
-                <bitfield name='scholar_flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_SCHOLAR_FLAG_*
-                    <flag-bit name='foraging_behavior'/>
-                </bitfield>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='creature_knowledge' pointer-type='creature_knowledgest'/>
         <stl-vector name="known_poetic_forms" type-name='int32_t' ref-target='poetic_form' since='v0.42.01' comment='bay12: poetic_form_known_id'/>
         <stl-vector name="known_musical_forms" type-name='int32_t' ref-target='musical_form' since='v0.42.01' comment='bay12: musical_form_known_id'/>
         <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 @@
     </struct-type>
 
     <struct-type type-name='historical_figure_info' original-name='hf_profilest'>
-        <pointer name="spheres"> bay12: metaphysical_profilest
+        <pointer name="metaphysical"> bay12: metaphysical_profilest
             <stl-vector name="spheres">
                 <enum base-type='int16_t' type-name='sphere_type'/>
             </stl-vector>
             <stl-vector name='associated_divination_set_id' type-name='int32_t' ref-target='divination_set' since='v0.47.01'/>
+            <pointer name='appearance_pform' type-name='unit_appearance'/>
+            <int32_t name='physical_form_strength'/>
+            <int32_t name='physical_form_recuperation'/>
+            <int32_t name='physical_form_age_days'/>
+            <int32_t name='physical_form_seed'/>
+            <int32_t name='related_civ_enid' ref-target='historical_entity'/>
+
+            <int32_t name='physical_form_portrait_texpos' comment='not saved'/>
+            <bool name='need_to_update_physical_form_portrait'/>
         </pointer>
 
         <pointer name="skills"> bay12: skill_profilest
@@ -432,6 +441,7 @@
             <bitfield name='flags' base-type='uint32_t' since='v0.44.06'> bay12: INVENTORY_PROFILE_FLAG_*
                 <flag-bit name='specific_items'/>
                 <flag-bit name='use_average_equipment_quality'/>
+                <flag-bit name='use_mythical_substances'/>
             </bitfield>
             <enum name='using_weapon_skill' type-name='job_skill' since='v0.44.06' comment='not saved'/>
             <pointer name='building_usage_profile' since='v0.47.01'> bay12: hf_building_usage_profilest
@@ -1662,6 +1672,7 @@
         <enum-item name='priest_cry'>
             <item-attr name='caption' value='to cry on a priest'/>
         </enum-item>
+        <enum-item name='success'/>
     </enum-type>
 
     <struct-type type-name='history_event_reason_info'> not an actual structure

diff --git a/df.init.xml b/df.init.xml
@@ -55,10 +55,13 @@
     <struct-type type-name='init_media'>
         <df-flagarray name='flag' index-enum='init_media_flags'/>
         <int32_t name='volume_master'/>
-        <int32_t name='volume_music'/>
-        <int32_t name='volume_ambience'/>
-        <int32_t name='volume_sfx'/>
-        <int32_t name='time_between_songs'/>
+        <int32_t name='volume_music_fort'/>
+        <int32_t name='volume_ambience_fort'/>
+        <int32_t name='volume_sfx_fort'/>
+        <int32_t name='time_between_songs_fort'/>
+        <int32_t name='volume_music_adv'/>
+        <int32_t name='volume_ambience_adv'/>
+        <int32_t name='volume_sfx_adv'/>
     </struct-type>
 
     <enum-type type-name='init_input_flags'>