Merge branch 'master' of git://github.com/DFHack/df-structures

DFHack · Sep 19, 2015 · 32960d3 · 32960d3
2 parents 4c63df9 + e2f7274
commit 32960d3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/df.globals.xml b/df.globals.xml
@@ -138,6 +138,7 @@
     -- .bss primitive
 
     <global-object name='activity_next_id' type-name='int32_t'/>
+    <global-object name='army_next_id' type-name='int32_t'/>
     <global-object name='art_image_chunk_next_id' type-name='int32_t'/>
     <global-object name='artifact_next_id' type-name='int32_t'/>
     <global-object name='building_next_id' type-name='int32_t'/>

diff --git a/df.military.xml b/df.military.xml
@@ -335,17 +335,21 @@
         <int32_t name="unk_5c"/>
     </struct-type>
 
+    <enum-type type-name='army_flags'>
+        <enum-item name='player'/>
+    </enum-type>
+
     <struct-type type-name='army' key-field='id'
                  instance-vector='$global.world.armies.all'>
         <int32_t name="id"/>
-        <compound type-name='coord' name="unk_pos1"/>
-        <compound type-name='coord' name="unk_pos2"/>
+        <compound type-name='coord' name="pos"/>
+        <compound type-name='coord' name="last_pos"/> guess
         <int16_t name="unk_10"/>
         <int32_t name="unk_14"/>
         <int32_t name="unk_18"/>
-        <stl-vector name="unk_1c">
+        <stl-vector name="members">
             <pointer>
-                <int32_t name="unk_0"/>
+                <int32_t name="nemesis_id"/>
                 <int32_t name="unk_4"/>
                 <int32_t name="unk_8"/>
                 <int32_t name="unk_c"/>
@@ -364,14 +368,14 @@
         </stl-vector>
         <stl-vector name="unk_2c">
             <pointer>
-                <int32_t name="unk_0"/>
-                <int32_t name="unk_4"/>
-                <int32_t name="unk_8"/>
-                <int32_t name="unk_c"/>
-                <int32_t name="unk_10"/>
-                <int32_t name="unk_14"/>
-                <int32_t name="unk_18"/>
-                <int32_t name="unk_1c"/>
+                <int32_t name="count"/> next five checks out in created units
+                <int32_t name="race"/> 
+                <int32_t name="population_id"/> 
+                <int32_t name="civ_id"/> 
+                <int32_t name="unk_10"/> same as unk_c0 in unit
+                <int32_t name="cultural_identity"/>
+                <int32_t name="unk_18"/> made creatures undead, so not sure maybe affliction?
+                <int32_t name="unk_1c"/> crashed df...
                 <int32_t name="unk_20"/>
                 <int32_t name="unk_24"/>
                 <int32_t name="unk_28"/>
@@ -380,8 +384,8 @@
         <int32_t name="unk_3c"/>
         <int32_t name="controller_id" ref-target='army_controller'/>
         <pointer name="controller" type-name="army_controller"/>
-        <df-flagarray name="unk_48"/>
-        <stl-vector name="unk_pos_x" type-name="int32_t"/>
+        <df-flagarray name="flags" index-enum='army_flags'/>
+        <stl-vector name="unk_pos_x" type-name="int32_t"/> probably path
         <stl-vector name="unk_pos_y" type-name="int32_t"/>
         <stl-vector name="unk_70" type-name="int32_t"/>
         <stl-vector name="unk_80" type-name="int32_t"/>