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): Pockets, nomex padding #5671

Merged
merged 8 commits into from
Nov 8, 2024

Conversation

yay855
Copy link
Contributor

@yay855 yay855 commented Nov 5, 2024

Added nomex and pocketed padding, both are fairly minor additions that increase encumbrance by a little bit in exchange for a little more storage space and fire resistance.

Checklist

Required

Optional

Purpose of change

Although some items ingame have pockets, you cannot sew pockets onto clothing, and you can't use nomex padding to make them more fire-resistant either. The number of fire-resistant clothes is actually quite few, and to be fair there are very few fire-spewing enemies.

Describe the solution

I have added two clothing mods, pocketed and nomex padded. Pocketed gives armor more pockets, nomex padded gives them fire resistance. I also added scute to the possible list of moddable clothing, since it is just bony, scaled leather.

Describe alternatives you've considered

Testing

Additional context

Added nomex and pocketed padding, both are fairly minor additions that increase encumbrance by a little bit in exchange for a little more storage space and fire resistance.
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Nov 5, 2024
@yay855 yay855 marked this pull request as draft November 5, 2024 03:05
Tweaked the increase values.
@yay855 yay855 marked this pull request as ready for review November 5, 2024 03:18
@chaosvolt
Copy link
Member

I also added scute to the possible list of moddable clothing, since it is just bony, scaled leather.

Don't see that change on the file changes currently.

@yay855
Copy link
Contributor Author

yay855 commented Nov 5, 2024

What the- I must have removed it when removing the value changes to the armor padding. One moment and I'll re-add it.

Edit: Done, it's back in now.

Copy link
Contributor

autofix-ci bot commented Nov 5, 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.

@chaosvolt
Copy link
Member

chaosvolt commented Nov 5, 2024

Okay this is mildly bothering me. What PR set it so that it can be used to modify plastic and rigid kevlar? It would make sense for it to be able to repair all materials it can modify, but then that'd allow sewing up all-plastic and rigid kevlar items. This seems like a mistake was made at some point prior to this PR. I guess they don't HAVE to match, but...

@yay855
Copy link
Contributor Author

yay855 commented Nov 5, 2024

Yeah, I can remove the plastic and rigid kevlar modifications tomorrow if you like.

@chaosvolt
Copy link
Member

Whichever works I guess, for now just injected scutes into the repair list as well since they're probably close enough to leather to allow being in both lists.

@github-actions github-actions bot added the mods PR changes related to mods. label Nov 5, 2024
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.

Load-tested and tried it out. Looks okay with most normal items, light survivor suit for example gains a fairly reasonable 3 liters:
image

Gets pretty spicy with thick items like MBR vests:
image

And for stuff like survivor helmets, well...
image

@yay855
Copy link
Contributor Author

yay855 commented Nov 5, 2024

Yeah, that's why I asked if there was a way to change the actual amount added based on the item's body parts covered. It seems there's no good way to implement this right now that's both balanced and sensible.

Load-tested and tried it out. Looks okay with most normal items, light survivor suit for example gains a fairly reasonable 3 liters: image

Gets pretty spicy with thick items like MBR vests: image

And for stuff like survivor helmets, well... image

@chaosvolt
Copy link
Member

I wonder how hard it'd be to code having it vary by item volume or the like...I might try to look into it, hmm.

@Soadreqm
Copy link
Contributor

Soadreqm commented Nov 5, 2024

I think the best case would be if it was possible to just set a multiplier for each body part. Big pockets for torso and legs, little pockets for arms, tiny for hands, feet and head.

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.

Will add for now and adjust in a follow-up PR I'm working on already.

@chaosvolt chaosvolt merged commit 4d95c9b into cataclysmbnteam:main Nov 8, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. mods PR changes related to mods.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants