From d0a41ecf42d5a3d212e059756d7455076da96007 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Thu, 20 Jun 2024 19:19:22 -0600
Subject: [PATCH] Update structures for 51.01-beta15

---
 df.advmode.xml       |  1 -
 df.creature-raws.xml | 24 ++++++++++++++----------
 df.graphics.xml      |  4 ++--
 df.history.xml       |  2 ++
 df.interaction.xml   |  5 +++++
 df.ui-menus.xml      | 29 +++++++++++++++++++++++++++++
 6 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/df.advmode.xml b/df.advmode.xml
index febae57db..d669b8839 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -1301,7 +1301,6 @@
     </class-type>
 
     <class-type type-name='adventure_movement_pathst' inherits-from='adventure_movement_optionst'>
-        <compound name='dest2' type-name='coord' comment='in bay12, these actually shadow the ones in the base class'/>
         <int16_t name='vpz'/>
         <bool name='is_acrobatic'/>
     </class-type>
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
index 42260ee0b..f42d07554 100644
--- a/df.creature-raws.xml
+++ b/df.creature-raws.xml
@@ -711,6 +711,7 @@
     </bitfield-type>
 
     <struct-type type-name='creature_interaction' original-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'/>
         <stl-string name='item_str0'/>
@@ -744,6 +745,18 @@
         <stl-vector name='verbal_speeches_token'/>
         <stl-string name='adv_name'/>
         <int32_t name='wait_period'/>
+
+        <static-array name='texpos_list_icon' count='4'><static-array count='3' type-name='int32_t'/></static-array>
+        <int32_t name='texpos_default_list_icon' type-name='InterfaceButtonMain'/>
+    </struct-type>
+
+    <struct-type type-name='body_actionst'>
+        <enum base-type='int32_t' name='type'> bay12: BodyActionType
+            <enum-item name='RETRACT_INTO_BP'/>
+            <enum-item name='CAN_DO_INTERACTION'/>
+            <enum-item name='ROOT_AROUND'/>
+        </enum>
+        <compound name='interaction' type-name='creature_interaction'/>
     </struct-type>
 
     <struct-type type-name='caste_body_info' original-name='bodyst'>
@@ -751,16 +764,7 @@
 
         <stl-vector name='attacks' pointer-type='caste_attack'/>
 
-        <stl-vector name='interactions'>
-            <pointer> bay12: body_actionst
-                <enum base-type='int32_t' name='type'> bay12: BodyActionType
-                    <enum-item name='RETRACT_INTO_BP'/>
-                    <enum-item name='CAN_DO_INTERACTION'/>
-                    <enum-item name='ROOT_AROUND'/>
-                </enum>
-                <compound name='interaction' type-name='creature_interaction'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='interactions' pointer-type='body_actionst'/>
 
         <stl-vector name='extra_butcher_objects'>
             <pointer> bay12: extra_butcher_objectst
diff --git a/df.graphics.xml b/df.graphics.xml
index 020894a13..6af972c62 100644
--- a/df.graphics.xml
+++ b/df.graphics.xml
@@ -299,7 +299,7 @@
             <static-array type-name='long' count='1' name='black_background_texpos'/>
             <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='10366' name='texture_indices2'/>
+            <static-array type-name='int32_t' count='10798' name='texture_indices2'/>
 
             <compound type-name='interface_setst' name='graphical_interface'/>
             <compound type-name='interface_setst' name='classic_interface'/>
@@ -410,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='660' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+        <static-array count='696' 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>
diff --git a/df.history.xml b/df.history.xml
index 7e4bed6fc..1add0ad22 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -385,6 +385,8 @@
         <pointer name='curse' since='v0.34.01'> bay12: interaction_profilest
             <stl-vector name="active_interactions" pointer-type='interaction'/>
             <stl-vector name="active_effects" pointer-type='interaction_effect'/>
+            <stl-vector name="active_interaction_year" type-name='int32_t'/>
+            <stl-vector name="active_interaction_season_tick" type-name='int32_t'/>
             <stl-vector name="can_do" pointer-type='interaction'/>
             <bitfield name="add_caste_flag" type-name='cie_add_tag_mask1'/>
             <bitfield name="remove_caste_flag" type-name='cie_add_tag_mask1'/>
diff --git a/df.interaction.xml b/df.interaction.xml
index 6e936691c..6f589ad8c 100644
--- a/df.interaction.xml
+++ b/df.interaction.xml
@@ -23,6 +23,9 @@
 
         <int32_t name='source_hfid' ref-target='historical_figure'/>
         <int32_t name='source_enid' ref-target='historical_entity' since='v0.42.01'/>
+
+        <static-array name='texpos_list_icon' count='4'><static-array count='3' type-name='int32_t'/></static-array>
+        <int32_t name='texpos_default_list_icon' type-name='InterfaceButtonMain'/>
     </struct-type>
 
     <enum-type type-name='interaction_effect_type' base-type='int16_t'> bay12: InteractionEffectType
@@ -81,6 +84,8 @@
                 <pointer name='target' type-name='unit'/>
                 <pointer name='instance' type-name='interaction_instance'/>
                 <bool name='new_unit'/>
+                <pointer name='start_year' comment='actually std::optional(int32_t)'/>
+                <pointer name='end_year' comment='actually std::optional(int32_t)'/>
             </vmethod>
             <vmethod name='activateOnItem'><pointer name='target' type-name='item'/></vmethod>
             <vmethod name='parseRaws' ret-type='bool'>
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index e7467a7b8..7f8f30525 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -1236,6 +1236,11 @@
         <enum-item name='WRESTLE_MOVE'/>
     </enum-type>
 
+    <enum-type type-name='adventure_interface_abilities_context' base-type='int32_t'> bay12: AdventureInterfaceAbilitiesContextType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='NORMAL'/>
+    </enum-type>
+
     <enum-type type-name='performance_menu_mode_type' base-type='int32_t'> bay12: PerformanceMenuModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='START'/>
@@ -2805,6 +2810,30 @@
                 <int32_t name='scroll_position_big_announce'/>
                 <bool name='scrolling_big_announce'/>
             </compound>
+
+            <compound name='abilities'> bay12: adventure_interface_abilitiesst
+                <bool name='open'/>
+                <enum name='context' type-name='adventure_interface_abilities_context'/>
+
+                <bool name='targeting'/>
+                <compound name='cursor' type='coord'/>
+                <bool name='have_target_list'/>
+                <bool name='target_scrolling'/>
+                <int32_t name='target_scroll_position'/>
+                <bool name='ctarget_scrolling'/>
+                <int32_t name='ctarget_scroll_position'/>
+
+                <stl-vector name='body_action' pointer-type='body_actionst'/>
+                <stl-vector name='body_action_use_flag' type-name='uint32_t'/>
+                <stl-vector name='body_action_interaction' type-name='int32_t' ref-target='interaction'/>
+
+                <stl-vector name='interaction_cdi' pointer-type='creature_interaction_effect_can_do_interactionst'/>
+                <stl-vector name='interaction_cdi_use_flag' type-name='uint32_t'/>
+                <stl-vector name='interaction_cdi_mat_effect_index' type-name='int32_t' ref-target='interaction'/>
+
+                <bool name='scrolling'/>
+                <int32_t name='scroll_position'/>
+            </compound>
         </compound>
 
         <stl-vector type-name='int32_t' name='viewunit_list'/>