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

Pockets that can let item inherit flags #57050

Merged
merged 7 commits into from
May 1, 2022

Conversation

bombasticSlacks
Copy link
Contributor

@bombasticSlacks bombasticSlacks commented Apr 23, 2022

Summary

None

Purpose of change

additional c++ for #56976

Describe the solution

added ability for pockets to have a "inherits_flags" attribute. Items in the pockets can then have their flags contribute to the above armor. Most useful for items like the exo modules.

Adds a module to test for helmets. Fixes far and near sight as well as adds a zoom function. The idea being that the character always has anything that they are looking at in focus.

Describe alternatives you've considered

Testing

not tested yet

Additional context

@Drew4484

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Apr 23, 2022
@Drew4484
Copy link
Contributor

Awesome, thank you! This should allow hand warmers in pockets too, which is a nice QoL for winter.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 23, 2022
@dseguin dseguin added Items / Item Actions / Item Qualities Items and how they work and interact Items: Containers Things that hold other things labels Apr 23, 2022
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Armor / Clothing Armor and clothing Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod labels Apr 27, 2022
@bombasticSlacks bombasticSlacks marked this pull request as ready for review April 27, 2022 00:11
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 27, 2022
src/item.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 27, 2022
@Drew4484
Copy link
Contributor

Just an FYI for these, I adjusted the folder and file names for the exosuits and associated files in #57237.
mods\Aftershock\items\armor\exosuit
modular_exoskeleton.json is now exosuit_frame.json
modular_exoskeleton_modules.json is now exosuit_modules.json.

@dseguin dseguin merged commit 9c5f4c9 into CleverRaven:master May 1, 2022
@bombasticSlacks bombasticSlacks deleted the inherits-pockets branch May 1, 2022 18:37
Drew4484 pushed a commit to Drew4484/Cataclysm-DDA that referenced this pull request May 1, 2022
* pocket inherits stuff

* adds test module

* Update modular_exoskeleton_modules.json

* CLANG

* Update src/item.cpp
@Termineitor244 Termineitor244 mentioned this pull request May 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants