aligning some interaction-related structures

PatrikLundell · Feb 14, 2020 · 8d31915 · 8d31915
1 parent d9f13fb
commit 8d31915
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/df.history.xml b/df.history.xml
@@ -92,6 +92,8 @@
             only a guess since most of figures have 102 (STANDARD); some have stuff like CLERK, SCOUT, BEAST_HUNTER, etc
             <enum base-type='int16_t' name='profession' type-name='profession'/>
             <int32_t since='v0.44.01'/>
+            <int32_t since='v0.47.02'/>
+            <pointer since='v0.47.02'/> only seen as all zeroes
         </pointer>
 
         <pointer name="pets">

diff --git a/df.interaction.xml b/df.interaction.xml
@@ -33,6 +33,9 @@
         <enum-item name='IN_MAGMA'/>
         <enum-item name='NO_WATER'/>
         <enum-item name='NO_MAGMA'/>
+        not sure of the order of these two:
+        <enum-item name='OUTSIDE'/>
+        <enum-item name='NO_THICK_FOG'/>
     </enum-type>
 
     <class-type type-name='interaction_effect' original-name='interaction_effectst'>
@@ -102,7 +105,8 @@
     </class-type>
 
     <class-type type-name='interaction_effect_change_weatherst' inherits-from='interaction_effect'>
-        TODO
+        <int32_t/>
+        <int32_t/>
     </class-type>
 
     <class-type type-name='interaction_effect_create_itemst' inherits-from='interaction_effect'>
@@ -200,9 +204,10 @@
         <enum-item name='FLEEING'/>
         <enum-item name='NEGATIVE_SOCIAL_RESPONSE'/>
         <enum-item name='TORMENT'/>
-        <enum-item/>
+        <enum-item name='DEFEND'/>
+        <enum-item name='MEDIUM_CURSE'/>
         <enum-item name='MINOR_CURSE'/>
-        <enum-item/>
+        <enum-item name='MEDIUM_BLESSING'/>
         <enum-item name='MINOR_BLESSING'/>
     </enum-type>
 
@@ -244,15 +249,16 @@
         <enum-item name='CONTEXT_BP'/>
         <enum-item name='CONTEXT_LOCATION'/>
         <enum-item name='CONTEXT_CREATURE_OR_LOCATION'/>
+        <enum-item name='RANDOM_NEARBY_LOCATION'/>
     </enum-type>
 
     <class-type type-name='interaction_target' original-name='interaction_targetst'>
         <int32_t name='index'/>
-        <stl-string name='unk_0'/>
+        <stl-string name='name'/>
         <stl-string name='manual_input'/>
         <enum name='location' type-name='interaction_target_location_type'/>
-        <stl-string name='unk_1'/>
-        <pointer name='unk_2' comment='uninitialized'/>
+        <stl-string name='reference_name'/>
+        <int32_t name='reference_distance'/>
         <virtual-methods>
             <vmethod ret-type='interaction_target_type' name='getType'/>
             <vmethod name='write_file'> <pointer comment='file_compressorst'/> </vmethod>

diff --git a/df.items.xml b/df.items.xml
@@ -1226,6 +1226,8 @@
         <int32_t name='sharpness'/>
         <compound name='stockpile' type-name='item_stockpile_ref'/>
         <int32_t name='vehicle_id' ref-target='vehicle' since='v0.34.08'/>
+        <int32_t since='v0.47.01' init-value='-1'/>
+        <int32_t since='v0.47.01' init-value='-1'/>
     </class-type>
 
     <struct-type type-name='item_stockpile_ref'>

diff --git a/df.units.xml b/df.units.xml
@@ -1685,8 +1685,6 @@
 
         <compound type-name='unit_personality' name='personality'/>
 
-        <int32_t name='unk_v47_1' since='v0.47.01'/>
-        <int32_t name='unk_v47_2' since='v0.47.01'/>
         <pointer name='performance_skills' since='v0.42.01'>
             <stl-vector pointer-type='unit_instrument_skill' name='musical_instruments'/>
             <stl-vector pointer-type='unit_poetic_skill' name='poetic_forms'/>
@@ -1844,8 +1842,10 @@
         </pointer>
         <int32_t name="current_focus" comment='weighted sum of needs focus_level-s'/>
         <int32_t name="undistracted_focus" comment='usually number of needs multiplied by 4'/>
-        <int32_t since='v0.47.01'/>
-        <int32_t since='v0.47.01'/>
+        <int32_t name='unk_v47_1' since='v0.47.01'/>
+        <int32_t name='unk_v47_2' since='v0.47.01'/>
+        <int32_t name='unk_v47_3' since='v0.47.01'/>
+        <int32_t name='unk_v47_4' since='v0.47.01'/>
     </struct-type>
 
     <enum-type type-name='unit_action_type'>