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

Weapon Categories: Krav Maga #51785

Merged
merged 5 commits into from
Sep 24, 2021

Conversation

Termineitor244
Copy link
Contributor

@Termineitor244 Termineitor244 commented Sep 22, 2021

Summary

Balance "Add weapon categories for Krav Maga"

Purpose of change

Contribute to the implementation of weapon categories, made possible by #50212.
Krav Maga: Too long list of possible weapons, difficult to maintain, difficult to see, and difficult to understand what kind of weapons are supposed to work with the style, this change should help with that.

Describe the solution

4 new weapon categories:

  • AUTOMATIC_RIFLES
  • AUTOMATIC_PISTOLS
  • KNIVES
  • BATONS

All the style weapons of Krav Maga belong to one of these 4, as laid out in the martial arts rebalance in #33602. The categories should be easy to understand, generic, and useful for other martial arts, so for example the "KNIVES" category can be used with other martial arts that make use of similar weapons, like Eskrima or Ninjutsu (Maybe Silat too?), and if one new knife is added, contributors would just need to add the weapon category in the item parameters, no more need to evaluate the different martial arts and maybe forget to put the new knife in one or two weapon lists.

Additionally, if you use copy-from for a new weapon, it will automatically be usable for the martial arts that the original weapon qualified for (Unless otherwise specified).

These categories are also very useful for mods (the original intention of their implementation was to facilitate cross-mod compatibility for martial arts/martial arts weapons).

Describe alternatives you've considered

Letting someone else do this, since my knowledge of fire arms is close to "pistols do pew pew".

Testing

New debug world, starting with Krav Maga learned, debug spawn a cudgel, the martial art works with it.
Debug spawn a baton, a trench knife, a combat knife, a glock 17, glock 18c and m1a, no problems observed.

Additional context

I want to tackle #51484 in a subsequent PR, but since I don't use generic guns, if someone else wants to do it, feel free to do so.
I'm open to the idea of adding more weapons to these categories, but that would need to be in another PR.
There needs to be a way to display the categories in the martial art info menu.

Images

No more style weapons list:
imagen
Cudgel:
imagen
Style techniques with the cudgel:
imagen

Some other weapons:
imagen
imagen
imagen
imagen
imagen
imagen

@actual-nh actual-nh added <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack labels Sep 22, 2021
@kevingranade kevingranade merged commit 3e58f31 into CleverRaven:master Sep 24, 2021
@Termineitor244 Termineitor244 deleted the Krav-Maga-Weapons branch September 24, 2021 20:20
@Maleclypse Maleclypse added the Martial Arts Arts, Techniques, weapons and anything touching martial arts. label Sep 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Martial Arts Arts, Techniques, weapons and anything touching martial arts. Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants