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

feat(content): Add stiletto category #4345

Merged
merged 2 commits into from
Mar 14, 2024

Conversation

KheirFerrum
Copy link
Collaborator

Purpose of change

Discord reminded me that soldering irons weren't supposed to have the KNIVES weapon category.

Describe the solution

Adds STILETTOS weapon category and grants them to Ninjutsu and Eskrima.

Describe alternatives you've considered

  • Could grant them to some other style than eskrima since it covers a goodly number of weapons already, options include Krav Maga and maybe fencing.

Testing

  • I built it, loaded a game and it didn't crash.
  • Check that screwdrivers and soldering irons appear with STILETTOS category
  • Check that eskrima and ninjutsu have it as their weapon options.

Additional context

Checklist

KNIVES category doesn't make sense for soldering iron and screwdriver.

Added to Ninjutsu and Eskrima cause it feels like it'd be weapons they use, feel free to correct me.
@github-actions github-actions bot added docs PRs releated to docs page JSON related to game datas in JSON format. labels Mar 13, 2024
Copy link
Contributor

autofix-ci bot commented Mar 13, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@KheirFerrum KheirFerrum changed the title Add stiletto category feat(content): Add stiletto category Mar 13, 2024
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
image

@scarf005 scarf005 merged commit 6ae1617 into cataclysmbnteam:main Mar 14, 2024
10 checks passed
@KheirFerrum KheirFerrum deleted the stiletto-category branch March 14, 2024 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PRs releated to docs page JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants