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

fix: martial arts damage buffs apply to all damage types #3728

Merged

Conversation

yay855
Copy link
Contributor

@yay855 yay855 commented Nov 20, 2023

Purpose of change

There are multiple unarmed martial arts weapons ingame that perform a variety of damage types, but many martial arts techniques and buffs only buffed bashing damage.

Describe the solution

All martial arts techniques and buffs that only buffed one or two of the three main melee damage types (bash, cut, stab) now buff all three.

Describe alternatives you've considered

Testing

Additional context

Checklist

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Nov 20, 2023
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Rest of it looks good, though I'd note that most of these buffs specify what damage types they modify, so should edit those to not reference a specific damage type.

Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

like CV said, I think we should change all descriptions to reflect PR, e.g +2 Bash damage to +2 damage to correctly describe changes.

Removed mention of bashing in descriptions for martial arts moves that now buff all three melee damage types.
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

LGTM

@scarf005 scarf005 added this pull request to the merge queue Nov 26, 2023
Merged via the queue into cataclysmbnteam:upload with commit be7323b Nov 26, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants