From d7c99e06ac8a4ee05848a3b040ec46cc95a29622 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Wed, 4 Sep 2024 09:58:50 -0600
Subject: [PATCH] 51.01-beta22

---
 df.advmode.xml  | 13 -------------
 df.graphics.xml |  4 ++--
 df.ui-menus.xml | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/df.advmode.xml b/df.advmode.xml
index 6c70c07e..a73ddbe0 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -790,19 +790,6 @@
             <int32_t name='place_sound_num'/>
         </compound>
 
-        <compound name='assume_identity' comment='Manages the Assume Identity UI when the AssumeIdentity menu is open'> bay12: assume_identity_menust
-            <enum name='mode' type-name='assume_identity_mode'/>
-            <compound name='name' type-name='language_name'/>
-            <int32_t name='worship_object' ref-target='historical_figure'/>
-            <enum name='profession' type-name='profession'/>
-            <int32_t name='origin' ref-target='historical_entity'/>
-            <stl-vector pointer-type='assume_identity_menu_choicest' name='base_choice'/>
-            <stl-vector pointer-type='assume_identity_menu_choicest' name='choice'/>
-            <stl-string name='filter'/>
-            <bool name='entering_filter'/>
-            <int32_t name='selected'/>
-        </compound>
-
         <int16_t name='move_direction_x' comment='x-axis direction for the last attempted player unit movement: -1 = west, 0 = none, 1 = east'/>
         <int16_t name='move_direction_y' comment='y-axis direction for the last attempted player unit movement: -1 = north, 0 = none, 1 = south'/>
         <int16_t name='move_direction_z' comment='z-axis direction for the last attempted player unit movement: -1 = down, 0 = none, 1 = up'/>
diff --git a/df.graphics.xml b/df.graphics.xml
index 056d00bb..8cba3fda 100644
--- a/df.graphics.xml
+++ b/df.graphics.xml
@@ -304,7 +304,7 @@
         <compound type-name='interface_setst' name='graphical_interface'/>
         <compound type-name='interface_setst' name='classic_interface'/>
 
-        <static-array type-name='int32_t' count='13284' name='texture_indices3'/>
+        <static-array type-name='int32_t' count='13310' name='texture_indices3'/>
         <stl-vector type-name='int32_t' name='texpos_boulder'/>
         <static-array type-name='int32_t' count='3905' name='texture_indices4'/>
         <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
@@ -312,7 +312,7 @@
         <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 type-name='int32_t' count='271' 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'/>
     </struct-type>
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index 18f59a42..8edafcf1 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -447,6 +447,7 @@
         <enum-item name='ADVENTURER_SITE_ENTITY'/>
         <enum-item name='CHARGEN_NAME'/>
         <enum-item name='CHARGEN_PET_NAME'/>
+        <enum-item name='ASSUME_IDENTITY_NAME'/>
     </enum-type>
 
     <enum-type type-name='image_creator_context_type' base-type='int32_t'> bay12: ImageCreatorContextType
@@ -2897,6 +2898,25 @@
                 <stl-vector name='butcher_target' pointer-type='item'/>
                 <stl-vector name='butcher_cutter' pointer-type='item'/>
             </compound>
+
+            <compound name='assume_identity'> bay12: adventure_interface_assume_identityst
+                <bool name='open'/>
+                <enum name='mode' type-name='assume_identity_mode'/>
+
+                <compound name='new_id_name' type-name='language_name'/>
+                <int32_t name='new_id_fake_worship_hfid' ref-target='historical_figure'/>
+                <enum name='new_id_fake_unit' type-name='profession'/>
+                <int32_t name='new_id_fake_entity_id' ref-target='historical_entity'/>
+
+                <int32_t name='scroll_position'/>
+                <bool name='scrolling'/>
+
+                <stl-vector pointer-type='assume_identity_menu_choicest' name='base_choice'/>
+                <stl-vector pointer-type='assume_identity_menu_choicest' name='choice'/>
+
+                <stl-string name='filter_str'/>
+                <bool name='entering_filter'/>
+            </compound>
         </compound>
 
         <stl-vector type-name='int32_t' name='viewunit_list'/>