From 79eee47dde7e31c634f62d14ec708e6691d698bc Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sat, 15 Jul 2023 11:09:21 -0600
Subject: [PATCH] A few updates

* squad_orderst: add "isEqual" vmethod, fix return type on "process"
* build_req_choicest: realign, fix vmethods
---
 changelog.txt   |  2 ++
 df.military.xml |  3 ++-
 df.ui-menus.xml | 10 +++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 3cc34c439..3db8c782a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -14,6 +14,8 @@ that repo.
 # Future
 
 ## Structures
+- ``build_req_choicest``: realign structure and fix vmethods
+- ``squad_orderst``: fix vmethods
 
 # 50.09-r1
 
diff --git a/df.military.xml b/df.military.xml
index 0ec3a41ad..f12c846e7 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -276,7 +276,7 @@
             <vmethod name='offsetPosition'>
                 <int16_t name='x'/> <int16_t name='y'/> <int16_t name='z'/>
             </vmethod>
-            <vmethod ret-type='bool' name='process'>
+            <vmethod name='process'>
                 <int32_t/> <int32_t/> <pointer name='soldier' type-name='unit'/>
             </vmethod>
             <vmethod ret-type='squad_order_cannot_reason' name='reasonCannot'>
@@ -296,6 +296,7 @@
             <vmethod name='getDescription'> <pointer type-name='stl-string'/> </vmethod>
             <vmethod name='isInactive' ret-type='bool' comment='always false'> <int32_t/> </vmethod>
             <vmethod name='isCombat' ret-type='bool' comment='not train'/>
+            <vmethod name='isEqual' ret-type='bool'><pointer name='other' type-name='squad_order'/></vmethod>
         </virtual-methods>
     </class-type>
 
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index b39227e1c..d3abb041e 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -27,8 +27,11 @@
     <class-type type-name='build_req_choicest'>
         <comment>One choice in the build item selector.</comment>
         <int32_t name="distance"/>
+        <bool/>
+        <stl-string/>
 
         <virtual-methods>
+            <vmethod is-destructor='true'/>
             <vmethod ret-type='build_req_choice_type' name='getType'/>
             <vmethod name='getName'>
                 <pointer type-name='stl-string' name='str'/>
@@ -41,8 +44,9 @@
             <vmethod ret-type='int32_t' name='getUsedCount'/>
             <vmethod ret-type='int32_t' name='getNumCandidates'/>
             <vmethod ret-type='bool'/>
-            <vmethod/>
-            <vmethod/>
+            <vmethod ret-type='bool' comment='get_unk1'/>
+            <vmethod comment='set_unk1'/>
+            <vmethod comment='clear_unk1'/>
         </virtual-methods>
     </class-type>
 
@@ -52,7 +56,6 @@
 
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
-        <stl-string/>
 
         <stl-vector name="candidates">
             <int32_t>
@@ -65,6 +68,7 @@
         </stl-vector>
 
         <int32_t name="used_count"/>
+        <bool name='unk_1'/>
     </class-type>
 
     <class-type type-name='build_req_choice_specst' inherits-from='build_req_choicest'>