Merge pull request #738 from Bumber64/patch-1

Announcement_infost flag indicates sparring; identify unit_action_data_attack flag
DFHack · Apr 1, 2024 · 05696ed · 05696ed
2 parents 162e42b + eb63089
commit 05696ed
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -20,6 +20,7 @@ Template for new versions:
 
 ## Structures
 - name many previously-unknown map-related fields and flag bits
+- ``unit_action_data_attack`` (``unit_move_attackst``): identify flags
 
 # 50.12-r2.1
 

diff --git a/df.announcements.xml b/df.announcements.xml
@@ -1241,7 +1241,7 @@
         <int32_t name='activity_event_id' init-value='-1' comment='same as field in report'/>
         <int32_t name='speaker_id' ref-target='unit'/>
         <bitfield base-type='uint8_t' name='flags'>
-            <flag-bit name='hostile_combat' comment='hunting or combat report, not sparring'/>
+            <flag-bit name='SPARRING_EVENT' comment='determined by unit_action_data_attack.flags.sparring_hit'/>
         </bitfield>
     </struct-type>
 </data-definition>

diff --git a/df.units.xml b/df.units.xml
@@ -2324,22 +2324,21 @@
         <int32_t name='unk_2c'/>
         <int32_t name='attack_velocity'/>
         <bitfield name='flags' base-type='int32_t'>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit name='quick'/>
-            <flag-bit name='heavy'/>
-            <flag-bit name='wild'/>
-            <flag-bit name='precise'/>
-            <flag-bit name='charge'/>
-            <flag-bit comment='multi-attack'/>
-            <flag-bit/>
-            <flag-bit name='lightly_tap'/>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit name='spar_report'/>
+            <flag-bit name='force_small_aim_minus' comment='(FORCE_SMALL_AIM_MINUS)'/>
+            <flag-bit name='can_get_momentum_bonus' comment='(CAN_GET_MOMENTUM_BONUS)'/>
+            <flag-bit name='no_parry' comment='(NO_PARRY)'/>
+            <flag-bit name='no_block' comment='(NO_BLOCK)'/>
+            <flag-bit name='does_not_stop_wait' comment='(DOES_NOT_STOP_WAIT)'/>
+            <flag-bit name='quick' comment='(QUICK)'/>
+            <flag-bit name='heavy' comment='(HEAVY)'/>
+            <flag-bit name='wild' comment='(WILD)'/>
+            <flag-bit name='precise' comment='(PRECISE)'/>
+            <flag-bit name='charge' comment='(INDEPENDENT_MULTIATTACK)'/>
+            <flag-bit name='bad_multiattack' comment='(BAD_MULTIATTACK)'/>
+            <flag-bit name='zero_criticals' comment='(ZERO_CRITICALS)'/>
+            <flag-bit name='lightly_tap' comment='(NO_LETHAL_INTENT)'/>
+            <flag-bit name='automatic_hit' comment='(AUTOMATIC_HIT)'/>
+            <flag-bit name='sparring_hit' comment='(SPARRING_HIT)'/>
         </bitfield>
         <enum base-type='int16_t' name='attack_skill' type-name='job_skill'/>
         <int32_t name='attack_accuracy'/>