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

Added martial arts and weapons compatibility messages #31244

Merged
merged 3 commits into from
Jun 9, 2019
Merged

Added martial arts and weapons compatibility messages #31244

merged 3 commits into from
Jun 9, 2019

Conversation

Hymore246
Copy link
Contributor

Summary

SUMMARY: Content "Added martial arts and weapons compatibility messages"

Purpose of change

Extension of #30334.
Changing weapons or styles will check if the style and weapon are usable together.

Describe the solution

When the player changes martial art styles, wields a weapon, or unwields a weapon, the game will display a message stating if the weapon/style combination can be used together. If they can be used together, the normal style initiate message will be displayed. But if not, a warning will be displayed to inform the player that they will not be able to use the weapon and style together.

In order to make this change possible I've added two new attributes to the martial arts object: "allow_melee" and "strictly_melee". A martial art with allow_melee set to true means it can be used with ANY melee weapon even if it is not part of the martial art's whitelist of weapons. A martial art with strictly_melee set to true means that the martial art cannot be used unarmed and the player must have a weapon equipped to use it.

Additional context

new_style_messages

@kevingranade kevingranade merged commit 331abf6 into CleverRaven:master Jun 9, 2019
@Hymore246 Hymore246 deleted the better-martial-arts-messaging branch June 11, 2019 02:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants