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

Add estoc to fencing weapons #40350

Merged
merged 2 commits into from
May 9, 2020
Merged

Conversation

CodeBandit
Copy link
Contributor

@CodeBandit CodeBandit commented May 8, 2020

Summary

SUMMARY: Balance "Add Estoc to fencing weapons"

Purpose of change

Add Estoc as a fencing weapon since estoc are fencing weapons.

edit: Also added estoc_inferior and estoc_fake as per @Termineitor244

Describe the solution

JSON edit

Describe alternatives you've considered

Not adding it

Testing

image

@curstwist curstwist added [JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack labels May 8, 2020
@Termineitor244
Copy link
Contributor

Great! But please add too the different variations of the estoc weapon, estoc_inferior and estoc_fake, the original rationale in the martial arts update was to include the weapon and all its variants as long as these remained similar in superficial form (The Medieval Swordsmanship martial art, for example, has the three different estoc weapons listed as possible weapons).

@CodeBandit
Copy link
Contributor Author

Great! But please add too the different variations of the estoc weapon, estoc_inferior and estoc_fake, the original rationale in the martial arts update was to include the weapon and all its variants as long as these remained similar in superficial form (The Medieval Swordsmanship martial art, for example, has the three different estoc weapons listed as possible weapons).

Thanks for the heads up, I added the estoc variations as well

@Termineitor244
Copy link
Contributor

Thanks for the heads up, I added the estoc variations as well

You´re welcome! Thanks for adding the variations!

@Rivet-the-Zombie Rivet-the-Zombie merged commit 6e75b98 into CleverRaven:master May 9, 2020
@CodeBandit CodeBandit deleted the Estoc branch May 9, 2020 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants