Resolve inconsistencies in clan_cats.json #3059
Open
+76
−65
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
j-gynn
requested changes
Jan 13, 2025
scripts/clan.py
Outdated
| @@ -634,13 +634,13 @@ def load_clan_txt(self): | |||
| members = sections[4].split(",") | |||
| other_clans = [] | |||
| if len(general) == 9: | |||
| if general[3] == "None": | |||
| if general[3] == None or general[3] == "None": | |||
There was a problem hiding this comment.
Suggested change
| if general[3] == None or general[3] == "None": | |
| if general[3] is None or general[3] == "None": |
It's more Pythonic to say if [variable] is None, or alternatively, if not [variable]. Please make this change wherever relevant
scripts/cat/pelts.py
Outdated
| elif self.white_patches in ["SEPIAPOINT", "MINKPOINT", "SEALPOINT"]: | ||
| self.white_patches_tint = "none" | ||
|
|
||
| elif self.white_patches in ['SEPIAPOINT', 'MINKPOINT', 'SEALPOINT']: |
There was a problem hiding this comment.
This is so hilariously minor but since I've asked for other changes, could these single quotes be replaced with double quotes?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About The Pull Request
nullinstead of"none"to indicate no tint.pattern(andcat.pelt.pattern) renamed totortie_marking(cat.pelt.tortiemarking)I didn't do one of the requested items, making sure the capitalization is consistent, because I'm not sure how all the sprite stuff works.
Linked Issues
Fixes #3039
Proof of Testing
I loaded up one of my medium-size Clans from stable (v0.11.2). Unless otherwise stated, first screenshot is before saving clan and second screenshot is after saving clan.
nullinstead ofnoneto indicate no tint:Allowing facets to be
null:Pattern renamed to tortie marking:
Changelog/Credits