Merge https://github.com/quietust/df-structures

Conflicts: df.creature-raws.xml
DFHack · Jan 27, 2012 · 6359571 · 6359571
2 parents 192b6ce + 3a4497d
commit 6359571
Showing 1 changed file with 28 additions and 14 deletions.
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -485,15 +485,15 @@
 
         <int32_t name='unk7'/>
 
-        <stl-vector name='body_parts'>
-            <pointer type-name='body_part_raw'/>
-        </stl-vector>
+        <compound name='unknown1'>
+            <stl-vector name='body_parts'>
+                <pointer type-name='body_part_raw'/>
+            </stl-vector>
 
-        <stl-vector name='attacks'>
-            <pointer/>
-        </stl-vector>
+            <stl-vector name='attacks'>
+                <pointer/>
+            </stl-vector>
 
-        <compound name='unknown1'>
             <int32_t name='unk8'/>
             <stl-vector type-name='int16_t' name='unk9a'/>
             <stl-vector type-name='int16_t' name='unk9b'/>
@@ -502,10 +502,9 @@
             <stl-vector name='unk12'/>
             <stl-vector type-name='int16_t' name='unk13'/>
             <stl-vector type-name='int32_t' name='unk14'/>
+            <static-array type-name='int32_t' name='unk15' count='4'/>
         </compound>
 
-        <static-array type-name='int32_t' name='unk15' count='4'/>
-
         <stl-vector name='caste_speech_1'/>
         <stl-vector name='caste_speech_2'/>
 
@@ -535,13 +534,24 @@
         <stl-vector type-name='int32_t' name='body_size_1'/>
         <stl-vector type-name='int32_t' name='body_size_2'/>
 
-        <static-array name='unk16' count='8'>
-           <stl-vector/>
-        </static-array>
+        <stl-vector name='unk_1164'/>
+        <stl-vector name='unk_1174'/>
+        <stl-vector name='unk_1184'/>
+        <stl-vector name='unk_1194'/>
+        <stl-vector name='unk_11a4'/>
+        <stl-vector name='unk_11b4'/>
+        <stl-vector name='unk_11c4'/>
+        <stl-vector name='unk_11d4'/>
         <stl-vector name='color_modifiers'>
             <pointer type-name='color_modifier_raw'/>
         </stl-vector>
-        <static-array name='unk17' count='9'>
+        <stl-vector name='unk_11f4'/>
+        <stl-vector name='unk_1204'/>
+
+        <static-array name='unk16a' count='4'>
+            <stl-vector/>
+        </static-array>
+        <static-array name='unk16b' count='4'>
             <stl-vector/>
         </static-array>
 
@@ -657,7 +667,11 @@
             <df-flagarray name='unk25_flags'/>
 
             <static-array type-name='int32_t' name='unk26' count='33'/>
-            <static-array name='unk27' count='5'><stl-vector/></static-array>
+            <stl-vector name='unk_2f00'/>
+            <stl-vector name='unk_2f10'/>
+            <stl-vector name='unk_2f20'/>
+            <stl-vector name='unk_2f30'/>
+            <stl-vector name='unk_2f40'/>
             <static-array type-name='int32_t' name='unk28' count='2'/>
         </compound>