Check for attachable subpockets first when holstering #56655
Merged
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
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:
(there's an unlisted tactical holster attached)
Cataclysm-DDA/data/json/items/armor/belts.json
Lines 325 to 326 in 69830f8
Describe the solution
Switch the check around so that attachable subpockets are listed before treating the parent item as a regular holster:
Describe alternatives you've considered
Testing
The unit tests added in #56367 still pass as expected:
Additional context