Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Announcement_infost flag indicates sparring; identify unit_action_data_attack flag #738

Merged
merged 5 commits into from
Apr 1, 2024
Merged

Announcement_infost flag indicates sparring; identify unit_action_data_attack flag #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e12a2a5
Update df.announcements.xml
Bumber64 Mar 21, 2024
ddc1517
Update df.units.xml
Bumber64 Mar 21, 2024
9f6a704
Merge branch 'DFHack:master' into patch-1
Bumber64 Apr 1, 2024
07ff51b
Update df.units.xml
Bumber64 Apr 1, 2024
eb63089
Update changelog.txt
Bumber64 Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion df.announcements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
31 changes: 15 additions & 16 deletions df.units.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'/>
Expand Down
Loading