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

Improve gun variant validator script #74127

Merged
merged 1 commit into from
May 27, 2024

Conversation

anothersimulacrum
Copy link
Member

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.

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.

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.
@github-actions github-actions bot added Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [Python] Code made in Python Code: Tooling Tooling that is not part of the main game but is part of the repo. labels May 26, 2024
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @jbytheway

@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 26, 2024
@dseguin dseguin merged commit 2642dcd into CleverRaven:master May 27, 2024
22 checks passed
@anothersimulacrum anothersimulacrum deleted the variant-script-bugs branch May 27, 2024 15:55
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 Code: Tooling Tooling that is not part of the main game but is part of the repo. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves json-styled JSON lint passed, label assigned by github actions [Python] Code made in Python
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants