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): shoulder holsters #3981

Merged
merged 3 commits into from
Dec 27, 2023

Conversation

Relgar
Copy link
Contributor

@Relgar Relgar commented Dec 26, 2023

Purpose of change

Adds the ability to create and find shoulder holsters like a cool 90s cop and/or super spy.

image

Describe the solution

You can make a holster that sits under your arm. Copied mostly from the existing holster item with some caveats:

  • I tried to make it so that we make use of existing items in the game - you can craft a shoulder holster from a normal holster, some standard sewing filament (10), and a shoulder strap.
  • Volume, weight and cost are all increased to account for the inclusion of the shoulder strap.
  • Moved to the strapped layer instead of waist, compact and oversize are preserved so mutants can make these and it doesn't interfere with other strapped arm armor.
  • Added to the accessory_weaponcarry so every zombie has a chance to have this (less chances than a normal holster), also added to the pawnshop and drugdealer item distribution groups, which is where you can find normal holsters. Also added these to the zombie cop death drops. Did not add these to military zombies, they have holsters put in with a 100% rate, so this might be overkill.

Describe alternatives you've considered

This is too cool not to have in the game.

Testing

  • Debugged a character in, can be crafted
  • Killed some mobs, can be found.

Additional context

Reviewers - may need to your assistance to make sure I've put in the correct values for distribution, not too familiar with those jsons.

@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label Dec 26, 2023
Copy link
Contributor

autofix-ci bot commented Dec 26, 2023

The Autofix app has automatically formatted this Pull Request.

If you edit your PR on web UI, you can ignore this message.
If you edit your PR locally, YOU MUST DO EITHER OF THE FOLLOWING:

  • Run git pull to merge the automated commit into your local copy of the PR branch.
  • Format your code locally, and force push to your PR branch.

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

@Relgar
Copy link
Contributor Author

Relgar commented Dec 26, 2023

PS. seems to be something about #3975 in the automated change for some reason.

@Relgar
Copy link
Contributor Author

Relgar commented Dec 26, 2023

Now that I've had a think about it I'm wondering if it's better thematically to have it strapped with compact flag so it doesn't affect other commonly strapped arm armor

@chaosvolt
Copy link
Member

Now that I've had a think about it I'm wondering if it's better thematically to have it strapped with compact flag so it doesn't affect other commonly strapped arm armor

Reasonable ye, consistent with stuff like back holsters having compact to avoid clashing with backpacks since balance-wise it undermines their utility.

@Admiral-Daala1541
Copy link

Admiral-Daala1541 commented Dec 27, 2023

If we could keep both flags thatd be preferable tbh. If only because mutants not being able to craft one in their size doesnt make a whole lot of sense.

@Relgar
Copy link
Contributor Author

Relgar commented Dec 27, 2023

That's a reasonable position - I'll keep it to strapped, compact (so it doesn't interfere with other strapped items), and oversize (so mutants can wear it).

Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

:3

@scarf005 scarf005 merged commit 6e303a5 into cataclysmbnteam:main Dec 27, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants