Refactor combo colours retrieval to use skin config lookups instead #12682
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
1 task
peppy
approved these changes
Jul 20, 2021
|
Separate from the follow-up "colourhax" PR, this one looks like a good code quality improvement. @smoogipoo requesting you do a sanity check of this one to make sure you agree. |
|
It looks ok from me. Feel free to merge if you've tested. |
smoogipoo
approved these changes
Jul 20, 2021
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.
This refactors the combo colours retrieval logic to not directly read the combo colours of the skin and use, but instead add a combo colour lookup (
SkinComboColourLookup) for skin config and retrieve the colour using it.This is required for a further change that overrides a given combo index with another special index instead, at a skin level, which can only ever be possible with this refactor.
Side note:
Skin-level and add a virtualGetComboColourmethod for bothDefaultSkinandLegacySkinto override, but I've refrained from doing so as currentlySkindoes not implement anything and always returnsnull, so I think it's a better choice to leave doing that for later, once it's settled how modern (lazer) skins would look like and what members they will have.