Update structures for 51.01-beta14

quietust · Jun 25, 2024 · bba2d3d · bba2d3d
1 parent 9a860f5
commit bba2d3d
Show file tree

Hide file tree

Showing 17 changed files with 1,809 additions and 367 deletions.
diff --git a/df.advmode.xml b/df.advmode.xml
diff --git a/df.announcements.xml b/df.announcements.xml
@@ -699,19 +699,15 @@
         <enum-item name='NIGHTFALL'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
-        <enum-item name='NO_INV_INTERACTION'>
-            <item-attr name='alert_type' value='GENERAL'/>
-        </enum-item>
+        <enum-item name='UNUSED_0001'/>
         <enum-item name='EMPTY_CONTAINER'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
         <enum-item name='TAKE_OUT_OF_CONTAINER'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
 
-        <enum-item name='NO_CONTAINER_FOR_ITEM'>
-            <item-attr name='alert_type' value='GENERAL'/>
-        </enum-item>
+        <enum-item name='UNUSED_0002'/>
         <enum-item name='PUT_INTO_CONTAINER'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
@@ -1093,6 +1089,12 @@
         <enum-item name='FOOD_WARNING' since='v0.50.01'>
             <item-attr name='alert_type' value='DEATH'/>
         </enum-item>
+        <enum-item name='PUT_ON_ITEM' since='v0.51.01'>
+            <item-attr name='alert_type' value='GENERAL'/>
+        </enum-item>
+        <enum-item name='TAKE_OFF_ITEM' since='v0.51.01'>
+            <item-attr name='alert_type' value='GENERAL'/>
+        </enum-item>
 
         <enum-item name='UNUSED_46'>
             <item-attr name='alert_type' value='GENERAL'/>
@@ -1210,6 +1212,11 @@
         <enum-item name='Unit'/>
     </enum-type>
 
+    <struct-type type-name='adv_announcementst'>
+        <stl-string name='str'/>
+        <pointer name='parent' type-name='report'/>
+    </struct-type>
+
     <struct-type type-name='popup_message' original-name='mega_announcementst'>
         <stl-string name='text'/>
 

diff --git a/df.buildings.xml b/df.buildings.xml
@@ -461,6 +461,10 @@
 
             -- 74
 
+            <vmethod name='adventurerLogic'/>
+            <vmethod name='adventurerRender'/>
+            <vmethod name='adventurerFeed'><stl-set name='events' type-name='interface_key'/></vmethod>
+
             <vmethod ret-type='bool' name='needsMagma'/>
             <vmethod name='removeUses'> <bool name='noscatter'/> <bool name='lost'/> </vmethod>
             <vmethod name='deconstructItems'> <bool name='noscatter'/> <bool name='lost'/> <bool name='from_damage'/> </vmethod>

diff --git a/df.globals.xml b/df.globals.xml
@@ -416,10 +416,6 @@
     <global-object name='jobvalue_setter'>
         <static-array count='258' pointer-type='unit'/>
     </global-object>
-    <global-object name='interactitem' pointer-type='item'/>
-    <global-object name='interactinvslot' pointer-type='unit_inventory_item'/>
-    <global-object name='handleannounce' type-name='bool'/>
-    <global-object name='preserveannounce' type-name='bool'/>
     <global-object name='updatelightstate' type-name='bool'/>
     <global-object name='start_dwarf_count' type-name='int16_t'/>
 

diff --git a/df.graphics.xml b/df.graphics.xml
@@ -143,6 +143,7 @@
         <pointer name='screentexpos_river' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_road' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_site' type-name='int32_t' is-array='true'/>
+        <pointer name='screentexpos_army' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_interface' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_n' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_s' type-name='int32_t' is-array='true'/>
@@ -152,6 +153,8 @@
         <pointer name='screentexpos_detail_to_ne' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_sw' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_se' type-name='int32_t' is-array='true'/>
+        <pointer name='screentexpos_site_to_s' type-name='int32_t' is-array='true'/>
+        <pointer name='screentexpos_cloud_bits' type-name='uint64_t' is-array='true'/>
 
         <pointer name='screentexpos_base_old' type-name='int32_t' is-array='true'/>
         <static-array count='8' name='screentexpos_edge_old'><pointer type-name='int32_t' is-array='true'/></static-array>
@@ -161,6 +164,7 @@
         <pointer name='screentexpos_river_old' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_road_old' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_site_old' type-name='int32_t' is-array='true'/>
+        <pointer name='screentexpos_army_old' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_interface_old' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_n_old' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_s_old' type-name='int32_t' is-array='true'/>
@@ -170,6 +174,8 @@
         <pointer name='screentexpos_detail_to_ne_old' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_sw_old' type-name='int32_t' is-array='true'/>
         <pointer name='screentexpos_detail_to_se_old' type-name='int32_t' is-array='true'/>
+        <pointer name='screentexpos_site_to_s_old' type-name='int32_t' is-array='true'/>
+        <pointer name='screentexpos_cloud_bits_old' type-name='uint64_t' is-array='true'/>
 
         <pointer name='edge_biome_data' type-name='int32_t' is-array='true'/>
         <pointer name='edge_type_n' type-name='int32_t' is-array='true'/>
@@ -261,7 +267,8 @@
         <pointer type-name='uint32_t' name='screentexpos_top_flag' is-array='true'/>
 
         <bool name='display_title'/>
-        <bool name='display_background'/>
+        <int32_t name='display_background'/>
+        <int32_t name='last_display_background'/>
 
         <pointer type-name='int32_t' name='screentexpos_refresh_buffer' is-array='true'/>
         <int32_t name='refresh_buffer_val'/>
@@ -271,7 +278,7 @@
 
         <static-array type-name='long' name='clipx' count='2'/>
         <static-array type-name='long' name='clipy' count='2'/>
-        <static-array type-name='cached_texturest' name='tex' count='10'/>
+        <static-array type-name='cached_texturest' name='tex' count='11'/>
         <stl-vector name='texblits' type-name='texblitst'/>
 
         <long name='rect_id'/>
@@ -288,20 +295,26 @@
         <int32_t name='dimx'/>
         <int32_t name='dimy'/>
 
-        <compound name='tileset'>
+        <compound name='tileset'> not a compound, actually misaligned!
             <static-array type-name='long' count='1' name='black_background_texpos'/>
-            <static-array type-name='int32_t' count='120' name='texture_indices1'/>
+            <static-array type-name='int32_t' count='119' name='texture_indices1'/>
             <stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
-            <static-array type-name='int32_t' count='8581' name='texture_indices2'/>
+            <static-array type-name='int32_t' count='10366' 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='12044' name='texture_indices3'/>
+            <static-array type-name='int32_t' count='13188' name='texture_indices3'/>
             <stl-vector type-name='int32_t' name='texpos_boulder'/>
-            <static-array type-name='int32_t' count='3588' name='texture_indices4'/>
+            <static-array type-name='int32_t' count='3905' name='texture_indices4'/>
             <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
-            <static-array type-name='int32_t' count='14379' name='texture_indices5'/>
+            <static-array type-name='int32_t' count='7969' name='texture_indices5'/>
+            <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_indices6'/>
+            <static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
+            <static-array type-name='int32_t' count='262' name='texture_indices7'/>
+            <static-array name='texpos_map_drawn' count='70'><stl-vector type-name='int32_t'/></static-array>
+            <static-array type-name='int32_t' count='6845' name='texture_indices8'/>
         </compound>
     </struct-type>
 
@@ -397,7 +410,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='531' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+        <static-array count='660' 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>
@@ -425,12 +438,22 @@
         <static-array type-name='int32_t' count='3' name='texpos_type_filter_left'/>
         <static-array type-name='int32_t' count='3' name='texpos_type_filter_right'/>
         <static-array type-name='int32_t' count='3' name='texpos_type_filter_text'/>
+        <static-array type-name='int32_t' count='3' name='texpos_button_wrestle_right'/>
+        <static-array type-name='int32_t' count='3' name='texpos_button_wrestle_equal'/>
+        <static-array type-name='int32_t' count='3' name='texpos_button_wrestle_left'/>
+        <static-array count='4' name='texpos_button_adventure_tactical_mode_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='4' name='texpos_button_adventure_tactical_mode_off'><static-array type-name='int32_t' count='2'/></static-array>
 
         <static-array count='3' name='texpos_button_announcement_open_all_announcements'><static-array type-name='int32_t' count='3'/></static-array>
         <static-array count='9' name='texpos_button_announcement_not_pausing_on_new_report' type-name='int32_t'/>
         <static-array count='9' name='texpos_button_announcement_pausing_on_new_report' type-name='int32_t'/>
         <static-array count='3' name='texpos_button_announcement_open_from_main'><static-array type-name='int32_t' count='3'/></static-array>
 
+        <static-array count='3' name='texpos_button_quality_up'><static-array type-name='int32_t' count='3'/></static-array>
+        <static-array count='3' name='texpos_button_quality_down'><static-array type-name='int32_t' count='3'/></static-array>
+        <static-array count='3' name='texpos_button_quality_up_inactive'><static-array type-name='int32_t' count='3'/></static-array>
+        <static-array count='3' name='texpos_button_quality_down_inactive'><static-array type-name='int32_t' count='3'/></static-array>
+
         <static-array count='3' name='texpos_button_stocks_recenter'><static-array type-name='int32_t' count='3'/></static-array>
         <static-array count='3' name='texpos_button_stocks_view_item'><static-array type-name='int32_t' count='3'/></static-array>
         <static-array count='3' name='texpos_button_stocks_forbid'><static-array type-name='int32_t' count='3'/></static-array>
@@ -479,7 +502,9 @@
         <static-array count='4' name='texpos_button_unit_sheet'><static-array count='3'><static-array type-name='int32_t' count='3'/></static-array></static-array>
         <static-array count='5' name='texpos_button_large_unit_sheet'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
         <static-array count='12' name='texpos_button_pets_livestock'><static-array count='3'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+        <static-array count='7' name='texpos_button_inventory_item'><static-array count='3'><static-array type-name='int32_t' count='3'/></static-array></static-array>
 
+        <static-array count='21' name='texpos_adventure_travel_dir' type-name='int32_t'/>
         <static-array count='2' name='texpos_liquid_numbers_on'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='2' name='texpos_liquid_numbers_off'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='2' name='texpos_ramp_arrows_on'><static-array type-name='int32_t' count='2'/></static-array>

diff --git a/df.history.xml b/df.history.xml
@@ -3830,6 +3830,7 @@
     </struct-type>
 
     <enum-type type-name='intrigue_corruption_result_rel_factor_type' base-type='int32_t'> bay12: IntrigueCorruptionResultRelFactorType
+        <enum-item name='None' value='-1'/>
         <enum-item name='Trust'/>
         <enum-item name='Loyalty'/>
         <enum-item name='Love'/>

diff --git a/df.items.xml b/df.items.xml
@@ -131,19 +131,19 @@
     </enum-type>
 
     <enum-type type-name='slab_engraving_type' base-type='int16_t'> bay12: EngravingIntentType
-        <enum-item name='Slab' value='-1'/>
+        <enum-item name='Slab' comment='NONE' value='-1'/>
         <enum-item name='Memorial'/>
-        <enum-item name='CraftShopSign' comment='STORE_CRAFTS'/>
-        <enum-item name='WeaponsmithShopSign' comment='STORE_WEAPON'/>
-        <enum-item name='ArmorsmithShopSign' comment='STORE_ARMOR'/>
-        <enum-item name='GeneralStoreSign' comment='STORE_GENERAL'/>
-        <enum-item name='FoodShopSign' comment='STORE_FOOD'/>
+        <enum-item comment='UNUSED_01'/>
+        <enum-item comment='UNUSED_02'/>
+        <enum-item comment='UNUSED_03'/>
+        <enum-item comment='UNUSED_04'/>
+        <enum-item comment='UNUSED_05'/>
         <enum-item name='Secrets' comment='from the gods? (SECRET)'/>
         <enum-item name='FoodImportsSign' comment='SRB_SHOP_IMPORT_FOOD'/>
         <enum-item name='ClothingImportsSign' comment='SRB_SHOP_IMPORT_CLOTHING'/>
         <enum-item name='GeneralImportsSign' comment='SRB_SHOP_IMPORT_GENERAL'/>
         <enum-item name='ClothShopSign' comment='SRB_SHOP_CLOTH'/>
-        <enum-item name='LeatherShopSign' comment='SRB_SHOP_LEATHER'/>
+        <enum-item name='LeatherShopSign' comment='SRB_SHOP_TANNING'/>
         <enum-item name='WovenClothingShopSign' comment='SRB_SHOP_CLOTHING_CLOTH'/>
         <enum-item name='LeatherClothingShopSign' comment='SRB_SHOP_CLOTHING_LEATHER'/>
         <enum-item name='BoneCarverShopSign' comment='SRB_SHOP_CRAFTS_BONE_CARVER'/>
@@ -153,7 +153,7 @@
         <enum-item name='BlacksmithShopSign' comment='SRB_SHOP_BLACK_SMITH'/>
         <enum-item name='ArmorsmithShopSign2' comment='SRB_SHOP_METAL_ARMOR_SMITH'/>
         <enum-item name='MetalCraftShopSign' comment='SRB_SHOP_METAL_CRAFTER'/>
-        <enum-item name='LeatherGoodsShopSign' comment='SRB_SHOP_FURNITURE_WOOD'/>
+        <enum-item name='LeatherGoodsShopSign' comment='SRB_SHOP_LEATHER_ACCESSORIES'/>
         <enum-item name='CarpenterShopSign' comment='SRB_SHOP_FURNITURE_WOOD'/>
         <enum-item name='StoneFurnitureShopSign' comment='SRB_SHOP_FURNITURE_STONE'/>
         <enum-item name='MetalFurnitureShopSign' comment='SRB_SHOP_FURNITURE_METAL'/>