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

allow "internal" wearables even with skin-contact gear on top #36062

Merged

Conversation

misterprimus
Copy link
Contributor

@misterprimus misterprimus commented Dec 13, 2019

Wear ear plugs while wearing power armor

Summary

SUMMARY: Bugfixes "Adds ability to wear under-the-skin gear like ear plugs even with skin contact-demanding items like power armor."

Purpose of change

Make the game make sense by allowing one to wear earplugs underneath power armor.

Describe the solution

Just wear earplugs while wearing power armor. Before this, it was impossible.

Describe alternatives you've considered

Testing

Wore ear plugs under power armor. Other gear still cannot be worn over it.

Additional context

Copy link
Member

@anothersimulacrum anothersimulacrum left a comment

Choose a reason for hiding this comment

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

This should be done with a flag, not with a check for how many body parts it covers.

@misterprimus
Copy link
Contributor Author

This should be done with a flag, not with a check for how many body parts it covers.

Could you explain? Isn't the "flag" the quantity of body parts being covered equaling 0?

@anothersimulacrum
Copy link
Member

That's really unclear, and not visible to JSON contributors anywhere. Flags are both documented and clear to JSON contributors.

@misterprimus
Copy link
Contributor Author

misterprimus commented Dec 13, 2019

That's really unclear, and not visible to JSON contributors anywhere. Flags are both documented and clear to JSON contributors.

Again, I don't follow. This automatically handles all items that don't cover any body parts. My understanding is power armor requires skin contact and therefore can only be worn over a certain body part when there is nothing covering it. Thus any item in existence now or created in the future would properly be compatible with power armor if it has no body parts coverage. What flag would you suggest and how would it not be redundant?

@anothersimulacrum
Copy link
Member

I suggest you add a new flag.

This automatically handles all items don't cover any body parts... Thus any item in existence now or created in the future would properly be compatible with power armor if it has no body parts coverage

This is not necessarily a good thing. A flag allows for selection, which is important here.

@misterprimus
Copy link
Contributor Author

That's really unclear, and not visible to JSON contributors anywhere. Flags are both documented and clear to JSON contributors.

Do you mean like putting an "under_the_skin" flag to an item like "mouthpiece" which technically covers "mouth" but really should be usable under power armor helmet?

@anothersimulacrum
Copy link
Member

Yes, that could be one use case.

@misterprimus misterprimus marked this pull request as ready for review December 13, 2019 06:23
@Rail-Runner
Copy link
Contributor

Maybe just generalize it to "POWERAMOR_COMPATIBLE" flag? Not just under-the-skin things could be worn with power armor, I think; things like briefcases and shopping bags could be too.

@anothersimulacrum
Copy link
Member

You need to document this flag.

src/player.cpp Outdated Show resolved Hide resolved
src/player.cpp Outdated Show resolved Hide resolved
misterprimus and others added 2 commits December 13, 2019 14:36
Co-Authored-By: BevapDin <tho_ki@gmx.de>
Co-Authored-By: BevapDin <tho_ki@gmx.de>
@misterprimus
Copy link
Contributor Author

Getting failure:
data/json/itemgroups/SUS/clothes_store.json needs to be linted
but I didn't change it.

@curstwist curstwist added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Mechanics: Character / Player Character / Player mechanics Items / Item Actions / Item Qualities Items and how they work and interact labels Dec 14, 2019
@kevingranade kevingranade merged commit 01965b9 into CleverRaven:master Dec 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON Mechanics: Character / Player Character / Player mechanics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants