Weapon Category Update #1709

KheirFerrum · 2022-07-08T13:00:46Z

Summary

SUMMARY: Infrastructure "Port over Weapon Categories and tweak to BN specifications."

Purpose of change

Add Weapon Categories, which allow easier addition of weapons to martial arts and hopefully in the future can be used to aid with holsters and magazines, to define what can and cannot be stored without writing a full thesis.

Describe the solution

Ports over all related PRs to this issue.

We will need to tweak these. Because from what I can read the system was updated at some point to force weapon categories, which honestly isn't the kind of system I'm looking for.

Category Display has been added with a rather different implementation from the inspiring PR, now the game will display the weapon categories listed in the MA jsons along with all applicable weapons. If you add a weapon via the old "weapons" variable it will list it as "Special" weapons for that style.

Category Translation was merged. So now it's not screaming in all caps and _.

Contains a fix for techniques. Previously the game would only read and add techniques, never clearing them when using copy-from in any form. Now it properly inherits and clears. I have not personally tested extend/delete.

Describe alternatives you've considered

Lots of FLAGs.

Testing

Make sure all weapons including guns are properly categorized.
Make sure that weapon styles display correctly.
Add in Category Display or equivalent.
Make sure I didn't accidentally add the fragments of any other implementations people were doing throughout this issue.

Additional context

PRs like Category Display, Category Translation could probably be merged, with fixes, mostly because the category display is part of the reason weapon categories have been enforced.

weapon_category for martial arts cross-mod compatibility Co-Authored-By: Saicchi <[email protected]>

Co-Authored-By: Termineitor244 <[email protected]>

Co-authored-by: Saicchi <[email protected]>

* KNIVES * QUARTERSTAVES * BLADED_FARMING * Remaining knife * MEDIUM_SWORDS * LONG_SWORDS * SHORT_SWORDS * CLAWS * BATONS

* CLAWS * BATONS * Remove QUARTERSTAVES * KNIVES * BLADED_FARMING * SHIVS Co-authored-by: Kevin Granade <[email protected]>

* KNIVES * BATONS * QUARTERSTAVES * BLADED_FARMING * CUTTING_POLEARMS * PIERCING_POLEARMS * Removed non-sensical weapons * Removed swords * HOOKING_POLEARMS * POLEARMS

Weapon Categories: Fior Di Battaglia

Weapons Categories: Fencing

* BIONIC_WEAPONRY * CLAWS Co-Authored-By: Termineitor244 <[email protected]>

* make Zweihander a longsword * make estoc a longsword * Update martialarts.json * new sword categories * added new categories to weapons (except Japanese swords) and removed zwie- from long swords * added Japanese sword category to weapons

Weapon categories: Aikido, Judo, Bōjutsu and weapon category specific techniques

Coolthulhu · 2022-07-14T07:29:35Z

Is this ready or still a draft?

KheirFerrum · 2022-07-15T14:37:10Z

Is this ready or still a draft?

Draft. I'm still going through the whole thing. I want to streamline the categories so that all weapons have only one category, then I need to try porting over the martial art weapon category display and tweak that so it doesn't scream at people.

Co-authored-by: Olanti <[email protected]>

…taclysm-BN into Weapon-Categories

src/item_factory.cpp

olanti-p

I didn't check the melee weapons yet, but the ranged ones are ok.

data/json/items/classes/gun.json

data/json/items/ranged/pneumatic.json

data/json/items/ranged/spearguns.json

lang/extract_json_strings.py

src/init.cpp

Co-authored-by: Olanti <[email protected]>

rifle_pneumatic and rifle_elastic copy-from rifle_base so they already inherit the same looks_like.

Copy over magnetic mod locations

olanti-p · 2023-03-30T16:54:12Z

Skimmed the melee weapons, look fine.
The last thing missing is weapon category validness check in check_martialarts() and I think it will be good to go.

Add weapon category check to martial art

If we want this changed better do it in a different PR rather than this stupidly massive one.

* Merge pull request #50212 from Saicchi/weaponcategory weapon_category for martial arts cross-mod compatibility Co-Authored-By: Saicchi <[email protected]> * Weapon Categories: Krav Maga Co-Authored-By: Termineitor244 <[email protected]> * SHIVS (#52615) * weapon categories in [F1] menu (#52402) Co-authored-by: Saicchi <[email protected]> * Weapon Categories: Ninjutsu (#51868) * KNIVES * QUARTERSTAVES * BLADED_FARMING * Remaining knife * MEDIUM_SWORDS * LONG_SWORDS * SHORT_SWORDS * CLAWS * BATONS * Weapon Categories: Eskrima (#51918) * CLAWS * BATONS * Remove QUARTERSTAVES * KNIVES * BLADED_FARMING * SHIVS Co-authored-by: Kevin Granade <[email protected]> * [CR] Weapon Categories: Silat (And Polearms categories) (#51972) * KNIVES * BATONS * QUARTERSTAVES * BLADED_FARMING * CUTTING_POLEARMS * PIERCING_POLEARMS * Removed non-sensical weapons * Removed swords * HOOKING_POLEARMS * POLEARMS * POLEARMS (#52579) * Merge pull request #52671 from Termineitor244/Fior-Di-Battaglia-Weapons Weapon Categories: Fior Di Battaglia * Merge pull request #52786 from Termineitor244/Fencing-Weapons Weapons Categories: Fencing * Weapon Categories: Bionic Combatives (#52885) * BIONIC_WEAPONRY * CLAWS Co-Authored-By: Termineitor244 <[email protected]> * Weapon Categories: Medieval Swordsmanship (#53449) * make Zweihander a longsword * make estoc a longsword * Update martialarts.json * new sword categories * added new categories to weapons (except Japanese swords) and removed zwie- from long swords * added Japanese sword category to weapons * bokken and bio blade (#53695) * Rename * Merge pull request #57008 from Termineitor244/Weapon-Categories-Final Weapon categories: Aikido, Judo, Bōjutsu and weapon category specific techniques * Styling * Display weapon category in item info. * Strip out gun weapon categories * Add weapon categories to guns All guns now have their own categories, wheeeeee I want to die. * JSON fixes * Add weapon categories to melee weapons Reorganized - Axes and similar are in their own file. - Moved Shivs to misc.json. - Macuahuitl moved to swords - Fake and Inferior variants always underneath "original" versions. Reorganized melee weapon categories to follow form/function better. * martial arts update Update MA in accordance with changed weapon categories. * Display and sort Weapons displayed in MA based on category listed in MA json, any weapons specially added are listed as Special weapons. There can be duplicates on this list. Katanas appear in 1H_SWORDS and JAPANESE_SWORDS for instance. * Tweaks Update martialarts.json Update martialarts.cpp * Translated string Update Co-Authored-By: Saicchi <[email protected]> Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]> * Tonfa separation from Batons Unique enough and keeps them out of Fencing style * Update martialarts.json * Update martialarts.json * Linting * Update weapons.json * Fixes Add the special stuff I missed from Ninjutsu and Silat. Fix a few logic issues. * Reference fix * Mod Update Add weapon categories to most mods. * Linting * Update tools.json * Update src/item.cpp Co-authored-by: Olanti <[email protected]> * Update src/martialarts.cpp Co-authored-by: Olanti <[email protected]> * Update description and add extract function to table * Move weapon category check * Update lang/extract_json_strings.py Co-authored-by: Olanti <[email protected]> * Alphabetize * Alphabetize 2 * Remove looks_like rifle_pneumatic and rifle_elastic copy-from rifle_base so they already inherit the same looks_like. * Magnetic weapon fix Copy over magnetic mod locations * Fix name for 1shot default rifle * Update martialarts.cpp Add weapon category check to martial art * No reason to change this here. If we want this changed better do it in a different PR rather than this stupidly massive one. --------- Co-authored-by: Saicchi <[email protected]> Co-authored-by: Termineitor244 <[email protected]> Co-authored-by: Termineitor244 <[email protected]> Co-authored-by: Saicchi <[email protected]> Co-authored-by: Kevin Granade <[email protected]> Co-authored-by: Angela Graves <[email protected]> Co-authored-by: catdach <[email protected]> Co-authored-by: David Seguin <[email protected]> Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> Co-authored-by: Olanti <[email protected]>

KheirFerrum and others added 15 commits July 8, 2022 18:36

Merge pull request #50212 from Saicchi/weaponcategory

ffea314

weapon_category for martial arts cross-mod compatibility Co-Authored-By: Saicchi <[email protected]>

Weapon Categories: Krav Maga

81723d3

Co-Authored-By: Termineitor244 <[email protected]>

SHIVS (#52615)

fbb96a9

weapon categories in [F1] menu (#52402)

72e12cc

Co-authored-by: Saicchi <[email protected]>

Weapon Categories: Ninjutsu (#51868)

f9c14f9

* KNIVES * QUARTERSTAVES * BLADED_FARMING * Remaining knife * MEDIUM_SWORDS * LONG_SWORDS * SHORT_SWORDS * CLAWS * BATONS

Weapon Categories: Eskrima (#51918)

a31bebc

* CLAWS * BATONS * Remove QUARTERSTAVES * KNIVES * BLADED_FARMING * SHIVS Co-authored-by: Kevin Granade <[email protected]>

[CR] Weapon Categories: Silat (And Polearms categories) (#51972)

f11d919

* KNIVES * BATONS * QUARTERSTAVES * BLADED_FARMING * CUTTING_POLEARMS * PIERCING_POLEARMS * Removed non-sensical weapons * Removed swords * HOOKING_POLEARMS * POLEARMS

POLEARMS (#52579)

70a1d00

Merge pull request #52671 from Termineitor244/Fior-Di-Battaglia-Weapons

03e0a34

Weapon Categories: Fior Di Battaglia

Merge pull request #52786 from Termineitor244/Fencing-Weapons

8f7f808

Weapons Categories: Fencing

Weapon Categories: Bionic Combatives (#52885)

dc657b2

* BIONIC_WEAPONRY * CLAWS Co-Authored-By: Termineitor244 <[email protected]>

bokken and bio blade (#53695)

0a69097

Rename

e41d996

Merge pull request #57008 from Termineitor244/Weapon-Categories-Final

3f509f1

Weapon categories: Aikido, Judo, Bōjutsu and weapon category specific techniques

KheirFerrum marked this pull request as draft July 8, 2022 13:00

Styling

f3f15c6

Coolthulhu self-assigned this Jul 9, 2022

Coolthulhu removed their assignment Aug 14, 2022

github-actions bot added JSON related to game datas in JSON format. mods PR changes related to mods. src changes related to source code. tests changes related to tests translation labels Dec 3, 2022

KheirFerrum force-pushed the Weapon-Categories branch from d845441 to 08e2dd4 Compare December 3, 2022 22:58

github-actions bot removed the translation label Dec 3, 2022

KheirFerrum force-pushed the Weapon-Categories branch from 08e2dd4 to be4f99f Compare December 3, 2022 23:06

Display weapon category in item info.

050fcb6

KheirFerrum and others added 5 commits March 25, 2023 20:22

Update src/item.cpp

f900242

Co-authored-by: Olanti <[email protected]>

Update src/martialarts.cpp

52b3f9a

Co-authored-by: Olanti <[email protected]>

Update description and add extract function to table

deeaeae

Merge branch 'Weapon-Categories' of https://github.com/KheirFerrum/Ca…

0b071f7

…taclysm-BN into Weapon-Categories

Merge remote-tracking branch 'upstream/upload' into Weapon-Categories

061a65e

olanti-p reviewed Mar 29, 2023

View reviewed changes

src/item_factory.cpp Outdated Show resolved Hide resolved

Move weapon category check

0a25ff1

olanti-p reviewed Mar 30, 2023

View reviewed changes

KheirFerrum and others added 6 commits March 30, 2023 15:31

Update lang/extract_json_strings.py

2ead8d9

Co-authored-by: Olanti <[email protected]>

Alphabetize

c2cb999

Alphabetize 2

32d9cae

Remove looks_like

0839df6

rifle_pneumatic and rifle_elastic copy-from rifle_base so they already inherit the same looks_like.

Magnetic weapon fix

bd146f1

Copy over magnetic mod locations

Fix name for 1shot default rifle

8a1f652

Update martialarts.cpp

fdc7b0d

Add weapon category check to martial art

olanti-p approved these changes Mar 30, 2023

View reviewed changes

KheirFerrum added 3 commits March 30, 2023 18:36

No reason to change this here.

18a8000

If we want this changed better do it in a different PR rather than this stupidly massive one.

Merge branch 'upload' into Weapon-Categories

8270262

Merge branch 'upload' into Weapon-Categories

4592dcd

olanti-p merged commit 42cb8b6 into cataclysmbnteam:upload Mar 30, 2023

KheirFerrum deleted the Weapon-Categories branch March 30, 2023 22:05

This was referenced Apr 2, 2023

Weapon Categories for gunmods. #2541

Merged

Nerf nerf bats #2565

Merged

scarf005 mentioned this pull request May 22, 2023

docs: game objects joveeater/Cataclysm-BN#2

Closed

KheirFerrum mentioned this pull request Jun 3, 2023

Rework wield_better_weapon considerations #2930

Merged

4 tasks

olanti-p mentioned this pull request Sep 23, 2023

Suggestion: Label Weapon Categories in Item Description #2641

Closed

KheirFerrum mentioned this pull request Mar 13, 2024

feat(content): Add stiletto category #4345

Merged

3 tasks

ratmice mentioned this pull request Oct 30, 2024

feat: allow holstering to use a weapon_category instead of a flag #5632

Draft

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Weapon Category Update #1709

Weapon Category Update #1709

KheirFerrum commented Jul 8, 2022 •

edited

Loading

Coolthulhu commented Jul 14, 2022

KheirFerrum commented Jul 15, 2022

olanti-p left a comment

olanti-p commented Mar 30, 2023

Weapon Category Update #1709

Weapon Category Update #1709

Conversation

KheirFerrum commented Jul 8, 2022 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Coolthulhu commented Jul 14, 2022

KheirFerrum commented Jul 15, 2022

olanti-p left a comment

Choose a reason for hiding this comment

olanti-p commented Mar 30, 2023

KheirFerrum commented Jul 8, 2022 •

edited

Loading