Align a bunch of structures, and add new history events/collections

PatrikLundell · Nov 29, 2017 · 96f1474 · 96f1474
1 parent a417b6c
commit 96f1474
Show file tree

Hide file tree

Showing 7 changed files with 626 additions and 151 deletions.
diff --git a/df.art.xml b/df.art.xml
@@ -489,12 +489,11 @@
         <int32_t name='unit_id' ref-target='unit'/>
         <int32_t name='location_id' ref-target='abstract_building' aux-value='$$.site_id'/>
         <int32_t name='site_id' ref-target='world_site'/>
-        <int32_t comment='appears to be an entity_id?'/>
+        <int32_t name='group_id' ref-target='historical_entity'/>
         <stl-vector pointer-type='occupation_sub1'/>
         <int32_t/>
-        TODO: uninitialized on x64?
-        <int32_t/>
-        <int32_t/>
+        <pointer/>
+        <pointer/>
     </struct-type>
 
     <struct-type type-name='occupation_sub1'>

diff --git a/df.entities.xml b/df.entities.xml
@@ -2,16 +2,7 @@
     <struct-type type-name='entity_occasion_info'>
         <stl-vector name="occasions" pointer-type='entity_occasion' since='v0.42.01'/>
         <int32_t name="next_occasion_id"/>
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
+        <static-array type-name='int32_t' count='10'/>
         <int32_t />
     </struct-type>
     <struct-type type-name='entity_occasion'>
@@ -27,10 +18,6 @@
         <int32_t />
         <stl-vector name='schedule' pointer-type='entity_occasion_schedule' />
         <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
     </struct-type>
     <enum-type type-name='occasion_schedule_type' base-type='int32_t'>
         <enum-item name='DANCE_PERFORMANCE'/>
@@ -59,7 +46,6 @@
         <stl-vector name='features' pointer-type='entity_occasion_schedule_feature' />
         <int32_t />
         <int32_t />
-        <int32_t />
     </struct-type>
     <enum-type type-name='occasion_schedule_feature' base-type='int32_t'>
         <enum-item />
@@ -88,9 +74,6 @@
         <int32_t />
         <int32_t />
         <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
     </struct-type>
     <struct-type type-name='entity_activity_statistics'>
         <compound name='food'>
@@ -504,9 +487,7 @@
         <int32_t name='next_uniform_id'/>
 
         <compound name='unknown1b'>
-<!-- one of these 4 vectors was removed, not sure which one is worship
             <stl-vector name='unk32a' type-name='int32_t' comment='empty'/>
--->
             <stl-vector name='unk32b' type-name='int32_t'/>
             <stl-vector name='worship' type-name='int32_t' ref-target='historical_figure'/>
             <stl-vector name='unk32d' type-name='int32_t'/>
@@ -532,7 +513,6 @@
                     <int32_t/>
                 </pointer>
             </stl-vector>
-            <stl-vector since='v0.44.01'/>
 
             <int16_t name='unk33'/>
             <stl-vector name='unk34a' type-name='int16_t'/>
@@ -600,8 +580,8 @@
         <stl-vector type-name='int32_t' since='v0.42.01'/>
         <pointer name='occasion_info' type-name='entity_occasion_info'/>
 
-        <stl-vector name='meeting_events' pointer-type='meeting_event'/>
         <stl-vector since='v0.44.01'/>
+        <stl-vector name='meeting_events' pointer-type='meeting_event'/>
         <pointer name='activity_stats' type-name='entity_activity_statistics'/>
 
         <compound name='unknown1e'>
@@ -1159,7 +1139,7 @@
                         <int32_t/>
                     </pointer>
                     <pointer name='data1'>
-                        <enum name='reason' base-type='int32_t' type-name='agreement_conclusion_reason'/>
+                        <enum name='reason' base-type='int32_t' type-name='history_event_reason'/>
                         <int32_t/>
                         <int32_t/>
                         <int32_t name='site' ref-target='world_site'/>