Merge branch 'master' of https://github.com/DFHack/df-structures into…

… v4702

df.creature-raws.xml

@@ -597,6 +597,8 @@
             <flag-bit name='latch'/>
             <flag-bit name='main'/>
             <flag-bit name='edge'/>
+            <flag-bit/>
+            <flag-bit/>
         </bitfield>
         <stl-vector type-name='int32_t' name='specialattack_type' comment='0 = inject extract, 1 = suck blood, 2 = perform interaction'/>
         <stl-vector type-name='int16_t' name='specialattack_mat_type' comment='extract injected'/>

df.history.xml

@@ -1316,6 +1316,9 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='attacker_general_hf' ref-target='historical_figure'/>
         <int32_t name='defender_general_hf' ref-target='historical_figure'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_war_destroyed_sitest' inherits-from='history_event'>
@@ -1388,6 +1391,7 @@
         <enum-item name='FALLING_OBJECT'/>
         <enum-item name='LEAPT_FROM_HEIGHT'/>
         <enum-item name='DROWN_ALT2'/>
+        <enum-item/>
     </enum-type>
 
     <class-type type-name='history_event_hist_figure_diedst' inherits-from='history_event'>
@@ -1411,6 +1415,8 @@
         <int32_t name='histfig' ref-target='historical_figure'/>
         <enum base-type='int32_t' name='link_type' type-name='histfig_entity_link_type'/>
         <int32_t name='position_id' comment='index into entity.positions.own'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
     </class-type>
 
     <class-type type-name='history_event_remove_hf_entity_linkst' inherits-from='history_event'>
@@ -1536,6 +1542,9 @@
         <int32_t name='unit' ref-target='unit'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
     </class-type>
 
     <class-type type-name='history_event_artifact_recoveredst' inherits-from='history_event'>
@@ -1588,6 +1597,7 @@
         <int32_t name='entity' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='structure' ref-target='abstract_building'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
     </class-type>
 
     <enum-type type-name='entity_action_type'>
@@ -1606,6 +1616,8 @@
         <int32_t name='migrant_entity' ref-target='historical_entity'/>
         <int32_t name='join_entity' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_created_buildingst' inherits-from='history_event'>
@@ -1614,6 +1626,7 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='structure' ref-target='abstract_building'/>
         <int32_t name='builder_hf' ref-target='historical_figure'/>
+        <int32_t since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_replaced_buildingst' inherits-from='history_event'>
@@ -1781,6 +1794,9 @@
         <compound name='region_pos' type-name='coord2d'/>
         <int32_t name='attacker_general_hf' ref-target='historical_figure'/>
         <int32_t name='defender_general_hf' ref-target='historical_figure'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_war_plundered_sitest' inherits-from='history_event'>
@@ -1943,6 +1959,8 @@
         <enum-item name='LOSE_AFTER_RECEIVE_WOUND'/>
         <enum-item name='LOSE_AFTER_INFLICT_WOUND'/>
         <enum-item name='LOSE_AFTER_EXCHANGE_WOUND'/>
+        <enum-item/>
+        <enum-item/>
     </enum-type>
 
     <class-type type-name='history_event_hist_figure_simple_battle_eventst' inherits-from='history_event'>
@@ -2035,6 +2053,9 @@
         <int32_t name='layer' ref-target='world_underground_region'/>
         <enum base-type='int16_t' name='ghost_type' type-name='ghost_type'/>
         <int32_t name='flags2' comment='1:again'/>
+        <int32_t since='v0.47.02'/>
+        <int32_t since='v0.47.02'/>
+        <int32_t since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_hf_learns_secretst' inherits-from='history_event'>
@@ -2106,6 +2127,10 @@
     <class-type type-name='history_event_hf_gains_secret_goalst' inherits-from='history_event'>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <enum name='goal' type-name='goal_type' base-type='int32_t'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason' since='v0.47.02'/>
+        <int32_t since='v0.47.02' init-value='-1'/>
     </class-type>
 
     <class-type type-name='history_event_artifact_storedst' inherits-from='history_event'>
@@ -2118,6 +2143,7 @@
 
     <class-type type-name='history_event_agreement_formedst' inherits-from='history_event'>
         <int32_t name='agreement_id'/>
+        <int32_t since='v0.47.02'/>
     </class-type>
 
     <enum-type type-name='site_dispute_type'>
@@ -2332,6 +2358,7 @@
         <int32_t name='circumstance_id'/>
         <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
         <int32_t name='reason_id'/>
+        <int32_t since='v0.47.02'/>
     </class-type>
 
     <class-type type-name='history_event_hf_act_on_artifactst' inherits-from='history_event'>
@@ -2557,7 +2584,6 @@
       <int16_t name='content' comment='11 = inveighing against, 12 = urging love be shown'/>
       <int32_t name='preached_to_entity' ref-target='historical_entity'/>
       <int32_t name='against_entity' ref-target='historical_entity'/>
-      <int32_t/>
     </class-type>
 
     <class-type type-name='history_event_entity_persecutedst' inherits-from='history_event' since='v0.47.01'>
@@ -2623,6 +2649,8 @@
       <int32_t/> ? 6 = plots and schemes, 11 = agent
       <int32_t/> ? 4 = plots and schemes, 21 = agent
       <int32_t name='site' ref-target='world_site'/>
+      <int32_t since='v0.47.02' init-value='-1'/>
+      <int32_t since='v0.47.02' init-value='-1'/>
     </class-type>
 
     <class-type type-name='history_event_failed_intrigue_corruptionst' inherits-from='history_event' since='v0.47.01'>
@@ -2631,6 +2659,8 @@
       <int32_t name='target_hf' ref-target='historical_figure'/>
       <int32_t name='target_identity'/>
       <int32_t name='site' ref-target='world_site'/>
+      <int32_t since='v0.47.02' init-value='-1'/>
+      <int32_t since='v0.47.02' init-value='-1'/>
     </class-type>
 
     <class-type type-name='history_event_hf_convictedst' inherits-from='history_event' since='v0.47.01'>
@@ -2679,6 +2709,8 @@
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='arresting_entity' ref-target='historical_entity'/>
       <int32_t name='interrogator_hf' ref-target='historical_figure'/>
+      <stl-vector/> possibly; only saw all-zeroes
+      <int32_t/>
     </class-type>
 
     <enum-type type-name='history_event_collection_type'>

df.interaction.xml

@@ -326,6 +326,7 @@
         other: root around in, lick, head-bump, scratch, tusk, retract into shell, roll into a ball
         often [CDI:CAN_BE_MUTUAL] but not always
         <enum-item name='OTHER'/>
+        <enum-item/>
     </enum-type>
 
     <class-type type-name='interaction_target_materialst' inherits-from='interaction_target'>

df.reaction-raws.xml

@@ -39,6 +39,10 @@
         <stl-vector name="raw_strings" pointer-type='stl-string' since='v0.42.01'/>
         <stl-string name="category" since='v0.42.01'/>
         <stl-vector name="descriptions" pointer-type='reaction_description' since='v0.42.01'/>
+        <int32_t since='v0.47.02'/>
+        <int32_t since='v0.47.02'/>
+        <int32_t since='v0.47.02'/>
+        <int32_t since='v0.47.02'/>
     </struct-type>
 
     <struct-type type-name='reaction_category'>

df.syndrome.xml

@@ -299,8 +299,14 @@
         <int32_t name="chance" comment='%'/>
         <stl-string name="race_str"/>
         <stl-string name="caste_str"/>
-        <int32_t name='race' ref-target='creature_raw'/>
-        <int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
+        <stl-vector/>
+        <stl-vector/>
+        <stl-vector/>
+        <stl-vector/>
+        <stl-vector/>
+        <stl-vector/>
+        <int32_t init-value='-1'/>
+        <int32_t init-value='-1'/>
     </class-type>
 
     <class-type type-name='creature_interaction_effect_skill_roll_adjustst'
@@ -452,7 +458,9 @@
     </class-type>
 
     <class-type type-name='creature_interaction_effect_special_attack_interactionst' inherits-from='creature_interaction_effect'>
-        TODO
+        <stl-vector/>
+        <stl-vector pointer-type='stl-string'/>
+        <stl-string/>
     </class-type>
 
     <class-type type-name='creature_interaction_effect_stop_bleedingst' inherits-from='creature_interaction_effect'>
@@ -469,6 +477,7 @@
         <flag-bit name='SYN_INHALED'/>
         <flag-bit/>
         <flag-bit name='SYN_INGESTED'/>
+        <flag-bit/>
     </bitfield-type>
 
     <struct-type type-name='syndrome'

df.unit-thoughts.xml

@@ -1625,6 +1625,24 @@
             subthought is histfig_relationship_type
         </enum-item>
 
+        <enum-item/>
+
+        <enum-item/>
+
+        <enum-item/>
+
+        <enum-item/>
+
+        <enum-item/>
+
+        <enum-item/>
+
+        <enum-item/>
+
+        <enum-item/>
+
+        <enum-item/>
+
     </enum-type>
 </data-definition>
 

df.units.xml

@@ -293,6 +293,7 @@
     </enum-type>
 
     <enum-type type-name='ghost_type' base-type='int16_t'>
+        <enum-item name='None' value='-1'/>
         <enum-item name='MurderousGhost'/>
         <enum-item name='SadisticGhost'/>
         <enum-item name='SecretivePoltergeist'/>

df.world-site.xml

@@ -564,6 +564,9 @@
 
         <int32_t name='unk_v43_4' since='v0.43.01' comment='uninitialized'/>
         <stl-vector since='v0.44.01'/>
+        <padding size='160'/> TODO: verify on 32-bit
+        <int32_t since='v0.47.02'/>
+        <pointer since='v0.47.02'/> only seen all zeroes
     </struct-type>
 
     <struct-type type-name='cultural_identity' key-field='id'
@@ -601,6 +604,8 @@
         <int32_t name='unk_ec' init-value='-1'/>
         <int32_t name='unk_f0' init-value='-1'/>
         <int32_t name='unk_f4' comment='0 or 800000'/>
+        <stl-vector/> seen 416 bytes
+        <stl-vector/> seen 176 bytes
         <int32_t name="unk_f8"/>
     </struct-type>