Jsonize environemental protection form CBMs #32939
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rail-Runner
reviewed
Aug 5, 2019
Fris0uman
changed the title
added 2 commits
August 5, 2019 20:37
Fris0uman
changed the title
ZhilkinSerg
added
[C++]
jbytheway
reviewed
Aug 8, 2019
| ret = 5; | ||
| for( const bionic &bio : *my_bionics ) { | ||
| for( const auto &element : bio.info().env_protec ) { | ||
| if( element.first == bp || ( bp == bp_eyes && element.first == bp_head ) ) { |
There was a problem hiding this comment.
Why special-case the eyes? People can just add eyes as well if they mean it, right?
| if( ret > 5 ) { | ||
| ret = 5; | ||
| for( const bionic &bio : *my_bionics ) { | ||
| for( const auto &element : bio.info().env_protec ) { |
There was a problem hiding this comment.
You have a std::map here, so you shouldn't need to loop over it. Although it would be a little awkward to do the lookup if you keep the eyes special case code.
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Infrastructure "Jsonize Environemental protection form cbm"Purpose of change
Jsonize Environemental protection form cbm. Bump protection from eye armor and air filtration from 2 to 7.
Describe the solution
Add
env_protecvalue inbionic_data, use this value inget_env_resistDescribe alternatives you've considered
Just changing harcoded value without json stuff.
Additional context
Did one test with environemental protection bumped to 27 for air filtration in json and walked through tear gas without coughing.
Adresses #30012, although I didn't see anything in the code about poison resistance from air filtration cbm