51.01-beta26

quietust · Nov 27, 2024 · f3d7dcf · f3d7dcf
1 parent 656647b
commit f3d7dcf
Show file tree

Hide file tree

Showing 21 changed files with 498 additions and 90 deletions.
diff --git a/df.advmode.xml b/df.advmode.xml
@@ -326,6 +326,11 @@
         <enum-item name='GiftSpecificPet'/>
         <enum-item name='HorrifiedByPetGift'/>
         <enum-item name='ThankForPetGift'/>
+        250
+        <enum-item name='OfferService'/>
+        <enum-item name='LayQuestToRetrieveArtifact'/>
+        <enum-item name='GeneralChargeToServeSphere'/>
+        <enum-item name='ExhortToFinishCurrentQuest'/>
     </enum-type>
 
     <enum-type type-name='assume_identity_mode' base-type='int32_t'> bay12: AssumeIdentityMenuModeType
@@ -392,6 +397,7 @@
             <enum name="value_type" type-name='value_type'/>
             <enum name="squad_order_type" type-name='squad_order_type'/>
             <int32_t name='belief_system_id'/>
+            <int32_t name='retrieve_artifact_quest_art_id' ref-target='artifact_record'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable2'/>
@@ -412,6 +418,7 @@
             <int32_t name='squad_order_target_hfid' ref-target='historical_figure'/>
             <int32_t name='story_index'/>
             <int32_t name='question_identity_id'/>
+            <int32_t name='retrieve_artifact_quest_site_id' ref-target='world_site'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable3'/>
@@ -422,6 +429,7 @@
             <enum name="occupation_type" type-name='occupation_type'/>
             <int32_t name='squad_order_target_stid' ref-target='world_site'/>
             <int32_t name='story_frame_index'/>
+            <int32_t name='retrieve_artifact_quest_giver_entity_id' ref-target='historical_entity'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable4'/>
@@ -580,6 +588,14 @@
             <flag-bit name='always_prompt'/>
         </bitfield>
 
+        <bitfield name='chosen_flags' base-type='uint32_t'> bay12: ADVENTURE_CHOSEN_FLAG_*
+            <flag-bit name='did_deity_start_talk'/>
+        </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'/>
+
         <compound name='rumor_info'> bay12: adventure_rumor_infost
             <stl-vector name='base_data' pointer-type='adventure_rumor_datast' since='v0.44.10'/>
             <static-array name='data' count='34' index-enum='entity_event_type'>
@@ -740,9 +756,10 @@
             <stl-vector name='it_list' pointer-type='interaction_target_instance_listst'/>
 
             <stl-vector name='it_list_target_choice' pointer-type='general_ref' since='v0.47.01'/>
-            <pointer name='current_interaction_info_ptr' type-name='creature_interaction'/>
+            <pointer name='current_interaction_info_ptr' type-name='interaction_informationst'/>
             <int32_t name='selected_ability' init-value='-1' comment='natural ability'/>
             <int32_t name='selected_power' init-value='-1' comment='acquired power'/>
+            <pointer name='selected_item_power' type-name='item_powerst'/>
             <pointer name='current_it_list_itt' type-name='interaction_target'/>
             <int32_t name='max_target_number' init-value='-1'/>
             <int32_t name='target_range'/>

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'/>