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.

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

Conversation

Bumber64
Copy link
Contributor

#714

Accidentally deleted repository before merge.

df.units.xml Outdated
Comment on lines 2336 to 2342
<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)'/>
<flag-bit name='spar_report' comment='()'/>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should charge be renamed independent_multiattack?
What's the Bay12 name for spar_report?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say keep charge as it is.

There does not appear to be a bit for spar_report -- the header just goes up to SPARRING_HIT. That flag bit may need to be removed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i can't find any indication for a use of bit15 and believe we can safely remove spar_report

Copy link
Contributor Author

@Bumber64 Bumber64 Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say keep charge as it is.

Does it correctly describe the behavior? I.e., is the bit set when colliding during a charge?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just have a general policy of "if it's named, then don't change it unless it's egregious". Behavior notes can go in the comment.

@Bumber64
Copy link
Contributor Author

Coordinate with DFHack/dfhack#4247

@Bumber64
Copy link
Contributor Author

Bumber64 commented Apr 1, 2024

If you've got a list of all the unit_move_* original-names for unit_action_data_*, we can handle that in this PR.

@myk002
Copy link
Member

myk002 commented Apr 1, 2024

Do you mean

#define UNIT_MOVE_MOVE_FLAG_CHARGE BIT1
#define UNIT_MOVE_MOVE_FLAG_FROM_SPARRING BIT2

for struct unit_move_movest?

@myk002
Copy link
Member

myk002 commented Apr 1, 2024

actually, let's get this one merged so we can resolve the build error. Further changes can be in a separate PR

@myk002 myk002 merged commit 05696ed into DFHack:master Apr 1, 2024
11 of 14 checks passed
@Bumber64 Bumber64 deleted the patch-1 branch April 1, 2024 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants