Merge pull request DFHack#197 from dscorbett/entity_event

Identify new entity_event fields and clarify old ones
PatrikLundell · Jul 13, 2017 · a323be4 · a323be4
2 parents 542faa0 + d676fa8
commit a323be4
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/df.entities.xml b/df.entities.xml
@@ -1041,9 +1041,9 @@
                 <int32_t/>
             </compound>
             <compound name='abduction'>
-                <int32_t name='histfig_id' ref-target='historical_figure'/>
-                <int32_t/>
-                <int32_t/>
+                <int32_t name='histfig_id' ref-target='historical_figure' comment='abductee'/>
+                <int32_t name='site_id' ref-target='world_site'/>
+                <int32_t name='abductor_id' ref-target='historical_figure'/>
                 <int32_t/>
             </compound>
             <compound name='incident'>
@@ -1116,13 +1116,17 @@
             <compound name='insurrection_end'>
                 <int32_t name='site_id' ref-target='world_site'/>
                 <int32_t name='entity_id' ref-target='historical_entity'/>
-                <int32_t name='result' comment='0=overthrow, 1=fail, 2=crushed'/>
+                <enum name='result'>
+                  <enum-item name='Overthrow'/>
+                  <enum-item name='Failure'/>
+                  <enum-item name='Crushing'/>
+                </enum>
             </compound>
             <compound name='succession'>
                 <int32_t name='histfig_id' ref-target='historical_figure'/>
                 <int32_t/>
                 <int32_t name='entity_id' ref-target='historical_entity'/>
-                <int32_t name='position_assignment_id'/>
+                <int32_t name='position_assignment_id' refers-to='$(find-entity $$._parent.entity_id).positions.assignments[$]'/>
             </compound>
             <compound name='claim'>
                 <int32_t name='entity_id' ref-target='historical_entity'/>