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

Check for attachable subpockets first when holstering #56655

Merged
merged 1 commit into from
Apr 9, 2022

Conversation

dseguin
Copy link
Member

@dseguin dseguin commented Apr 7, 2022

Summary

None

Purpose of change

The "attachable-subpockets-as-holsters" feature in #56367 assumes the parent item is not defined as a holster, since "real" holsters use a different holstering action. This means that some MOLLE gear won't show attached pockets when holstering:

holster_nosub
(there's an unlisted tactical holster attached)

"use_action": [
{ "type": "holster", "holster_prompt": "Store tool or blade", "holster_msg": "You put your %1$s in your %2$s" },

Describe the solution

Switch the check around so that attachable subpockets are listed before treating the parent item as a regular holster:

holster_subpocket

Describe alternatives you've considered

Testing

The unit tests added in #56367 still pass as expected:

./tests/cata_test --rng-seed time "[pocket]"

Additional context

@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 BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 7, 2022
@Maleclypse Maleclypse added the Items: Containers Things that hold other things label Apr 7, 2022
@kevingranade kevingranade merged commit 8119612 into CleverRaven:master Apr 9, 2022
@dseguin dseguin deleted the molle_holster_check branch April 9, 2022 05:56
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: Containers Things that hold other things json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants