Realign incident against OS X 0.44.04 (32/64)

Closes #234
DFHack · Jan 12, 2018 · 72dd9b1 · 72dd9b1
1 parent 4f2e3fe
commit 72dd9b1
Showing 1 changed file with 35 additions and 13 deletions.
diff --git a/df.world.xml b/df.world.xml
@@ -62,25 +62,47 @@
         <int32_t name='id'/>
         <int32_t name="unk_4"/>
 
-        <stl-vector name="witnesses" type-name='int32_t' ref-target='unit'/>
+        <compound name='unk_sub0'>
+            <stl-vector name="witnesses" type-name='int32_t' ref-target='unit'/>
+
+            <int32_t name='unk_v44_1'/>
+            <int32_t name='unk_v44_2'/>
+
+            <int32_t name="victim" ref-target='unit'/>
+        </compound>
 
-        <int32_t name="victim" ref-target='unit'/>
         <int32_t name="victim_hfid" ref-target='historical_figure' since='v0.40.01'/>
-        <int32_t name="victim_race" ref-target='creature_raw' since='v0.40.01'/>
-        <int32_t name="victim_caste" ref-target='caste_raw' aux-value='$$.victim_race' since='v0.40.01'/>
+        <int32_t name='unk_v44_4'/>
+        <int32_t name='unk_v44_5'/>
 
-        <int32_t name='unk_v40_1b' init-value='-1' since='v0.40.01'/>
-        <int32_t name='unk_v40_1c' init-value='-1' since='v0.40.01'/>
+        <compound name='unk_sub1'>
+            <stl-vector name='unk_v44_6'/>
+            <int32_t name="victim_race" ref-target='creature_raw' since='v0.40.01'/>
+            <int32_t name="victim_caste" ref-target='caste_raw' aux-value='$$.victim_race' since='v0.40.01'/>
 
-        <int32_t name="killer" ref-target='unit'/>
-        <int32_t name="killer_hfid" ref-target='historical_figure' since='v0.40.01'/>
-        <int32_t name="killer_race" ref-target='creature_raw' since='v0.40.01'/>
-        <int32_t name="killer_caste" ref-target='caste_raw' aux-value='$$.killer_race' since='v0.40.01'/>
+            <int32_t name='unk_v40_1b' init-value='-1' since='v0.40.01'/>
+            <int32_t name='unk_v40_1c' init-value='-1' since='v0.40.01'/>
 
-        <int32_t name='entity1' ref-target='historical_entity' since='v0.40.01'/>
-        <int32_t name='unk_v40_2c' init-value='-1' since='v0.40.01'/>
+            <int32_t name="killer" ref-target='unit'/>
+        </compound>
 
+        <compound name='unk_sub2'>
+            <int32_t name="killer_hfid" ref-target='historical_figure' since='v0.40.01'/>
+            <int32_t name='unk_v44_8'/>
+            <int32_t name='unk_v44_9'/>
+            <stl-vector name='unk_v44_10'/>
+            <int32_t name="killer_race" ref-target='creature_raw' since='v0.40.01'/>
+            <int32_t name="killer_caste" ref-target='caste_raw' aux-value='$$.killer_race' since='v0.40.01'/>
+
+            <int32_t name='entity1' ref-target='historical_entity' since='v0.40.01'/>
+        </compound>
+
+        <int32_t name='unk_v40_2c' init-value='-1' since='v0.40.01'/>
         <int32_t name="crime_id" ref-target='crime'/>
+        <int32_t name='unk_v44_12' init-value='-1'/>
+
+        <stl-vector name='unk_v44_14'/>
+        <int32_t name='unk_v44_15' init-value='-1'/>
 
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='unk_v40_3a' init-value='-1' since='v0.40.01'/>
@@ -106,7 +128,7 @@
         <int32_t name="world_z"/>
         <int32_t name="unk_80"/>
 
-        <int32_t name='unk_v42_1' since='v0.42.01'/>
+        <pointer name='unk_v42_1' since='v0.42.01'/>
     </struct-type>
 
     <struct-type type-name='crime'