Improve gun variant validator script #74127
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
@Holli-Git ran into issues with the script with #74115
Describe the solution
Since speedloaders are generic for all guns with the appropriate ammotype and capacity, it doesn't make sense to count them in the identifier check with magazines, and so remove them from that check.
Also improve the error output for the identifier check so people know how to fix it (sorry Holli), and clarify/clean up the format of the valid identifier enumeration.
With this change, prune all the items from the blacklist that are no longer failing.
Testing
tools/json_tools/gun_variant_validator.py -v -cin data/json
Additional context
This script has a bit of jank with what it's trying to do, and if we're going to clear the blacklists/as we keep adding guns I expect changes will keep being necessary.