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

Adds missing knives to the Krav Maga list #51131

Merged
merged 4 commits into from
Sep 3, 2021
Merged

Adds missing knives to the Krav Maga list #51131

merged 4 commits into from
Sep 3, 2021

Conversation

RandDenner
Copy link
Contributor

@RandDenner RandDenner commented Aug 27, 2021

Summary

Bugfixes "Adds missing knives to the Krav Maga list"

Purpose of change

Fixes #51015
Verisimilitude, and meeting expectations of players that similar bladed weapons should all be usable with the martial art. Considering some of the ones already on the list, such as makeshift and bone knives, ones like the kukri should all definitely be included as well.

Describe the solution

Add the missing combat capable knives to the list.

Adds missing knives to the Krav Maga list. Considering some of the ones already on the list, such as makeshift and bone knives, ones like the kukri should all definitely be included as well
@RandDenner RandDenner changed the title Add files via upload Adds missing knives to the Krav Maga list Aug 27, 2021
@actual-nh actual-nh added <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Game: Balance Balancing of (existing) in-game features. Items / Item Actions / Item Qualities Items and how they work and interact Melee Melee weapons, tactics, techniques, reach attack labels Aug 27, 2021
@actual-nh
Copy link
Contributor

This might no longer be needed, or may be doable in a better way - see #50212, which just merged.

@RandDenner
Copy link
Contributor Author

RandDenner commented Aug 27, 2021

This might no longer be needed, or may be doable in a better way - see #50212, which just merged.

@actual-nh

Yes, it looks like it, once all the various weapon .json files are updated with the weapon categories.
In the meantime, this allows weapon compatibility for these weapons with krav maga now with a simple 12-line addition to a single file that adds them to the list so that these don't potentially get left off when the categories are set up for this martial arts form.

@kevingranade kevingranade merged commit 8fe84b4 into CleverRaven:master Sep 3, 2021
@RandDenner RandDenner deleted the expanded-krav-maga-knives branch September 3, 2021 22:40
Venera3 pushed a commit to Venera3/Cataclysm-DDA that referenced this pull request Sep 21, 2021
* Add files via upload

Adds missing knives to the Krav Maga list. Considering some of the ones already on the list, such as makeshift and bone knives, ones like the kukri should all definitely be included as well

* Update martialarts.json

Missed a comma. Oops!

* Update martialarts.json

No, I forgot to MOVE a comma.
Dumb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) Game: Balance Balancing of (existing) in-game features. Items / Item Actions / Item Qualities Items and how they work and interact [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.

Kukri should be added to Krav Maga weapons list
3 participants