fix: reloading magazine properly shows non-empty magazines with different, but compatible ammo #6174
+5
−4
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.
Purpose of change (The Why)
Describe the solution (The How)
Magazine selection logic had a minor iteration oversight:
Instead of considering accepting a non-empty magazine if the contained ammunition matched any of the supported ammo types, the magazine was rejected it if it didn't match all of them,
Describe alternatives you've considered
Insert empty magazines in the weapon and magic-reload the rounds inside it without taking the magazine out.
Testing
Vanilla:
Modded:
Additional context
Checklist
Mandatory
closes #1234
in Summary of the PR so it can be closed automatically.main
so it won't cause conflict when updatingmain
branch later.