From 7d170580896f973ee9628ebf3c757938dd8468ae Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Wed, 25 Jan 2023 20:28:34 -0600
Subject: [PATCH 1/2] realign: `creature_raw`, `army_controller`,
 `plant_growth`

---
 df.creature-raws.xml | 1 +
 df.military.xml      | 7 +++----
 df.plant-raws.xml    | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/df.creature-raws.xml b/df.creature-raws.xml
index 7949ad397..ecf696b18 100644
--- a/df.creature-raws.xml
+++ b/df.creature-raws.xml
@@ -1339,6 +1339,7 @@
         <int32_t name='next_modifier_id'/>
 
         <stl-vector name='raws' pointer-type='stl-string'/>
+        <static-array count='2' type-name='int32_t' name='statute_texpos' since='v0.50.0?'/>
     </struct-type>
 
     <struct-type type-name='creature_variation_convert_tag'>
diff --git a/df.military.xml b/df.military.xml
index f05ddc913..370836858 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -400,12 +400,11 @@
         <int32_t name="unk_44_2"/>
         <int32_t name='visitor_nemesis_id' ref-target='nemesis_record' comment="Set for VillainousVisit"/>
         <int32_t name='unk_44_4' comment="3, 6 seen for Villain"/>
-        <pointer name="unk_44_5"/>
-        <pointer name="unk_v47_1" comment="Could be before unk_44: haven't found any non zero unk_44"/>
-        <pointer name="unk_v47_2"/>
+        <stl-vector name="unk_44_5" type-name='int32_t'/>
         <int32_t name="unk_50"/>
         <stl-vector name="unk_54" type-name='int32_t'/>
-        <stl-vector name='unk_44_11v' since='v0.44.11'/>
+        <stl-vector name='unk_44_11v' type-name='int32_t' since='v0.44.11'/>
+        <stl-vector name='unk_v50_b0' type-name='int32_t' since='v0.50.0?'/>
         <pointer name='mission_report' type-name='mission_report'/>
         <compound name='data' is-union='true'>
             <pointer type-name='army_controller_sub1' name='t1'/>
diff --git a/df.plant-raws.xml b/df.plant-raws.xml
index 639957887..62540a941 100644
--- a/df.plant-raws.xml
+++ b/df.plant-raws.xml
@@ -262,6 +262,11 @@
         </bitfield>
         <int32_t name='trunk_height_perc_1'/>
         <int32_t name='trunk_height_perc_2'/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t init_value='-1'/>
+        <int32_t init_value='-1'/>
     </struct-type>
 
     <struct-type type-name='plant_growth_print'>

From dcefe199c4be7ffeb82375435396ae83104eb6ae Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Wed, 25 Jan 2023 22:23:02 -0800
Subject: [PATCH 2/2] Apply suggestions from code review

---
 df.creature-raws.xml | 2 +-
 df.military.xml      | 2 +-
 df.plant-raws.xml    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/df.creature-raws.xml b/df.creature-raws.xml
index ecf696b18..78b6325c8 100644
--- a/df.creature-raws.xml
+++ b/df.creature-raws.xml
@@ -1339,7 +1339,7 @@
         <int32_t name='next_modifier_id'/>
 
         <stl-vector name='raws' pointer-type='stl-string'/>
-        <static-array count='2' type-name='int32_t' name='statute_texpos' since='v0.50.0?'/>
+        <static-array count='2' type-name='int32_t' name='statute_texpos' since='v0.50.01'/>
     </struct-type>
 
     <struct-type type-name='creature_variation_convert_tag'>
diff --git a/df.military.xml b/df.military.xml
index 370836858..92c88dc59 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -404,7 +404,7 @@
         <int32_t name="unk_50"/>
         <stl-vector name="unk_54" type-name='int32_t'/>
         <stl-vector name='unk_44_11v' type-name='int32_t' since='v0.44.11'/>
-        <stl-vector name='unk_v50_b0' type-name='int32_t' since='v0.50.0?'/>
+        <stl-vector name='unk_v50_b0' type-name='int32_t' since='v0.50.01'/>
         <pointer name='mission_report' type-name='mission_report'/>
         <compound name='data' is-union='true'>
             <pointer type-name='army_controller_sub1' name='t1'/>
diff --git a/df.plant-raws.xml b/df.plant-raws.xml
index 62540a941..42fa70590 100644
--- a/df.plant-raws.xml
+++ b/df.plant-raws.xml
@@ -265,8 +265,8 @@
         <int32_t/>
         <int32_t/>
         <int32_t/>
-        <int32_t init_value='-1'/>
-        <int32_t init_value='-1'/>
+        <int32_t init-value='-1'/>
+        <int32_t init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='plant_growth_print'>