Civ primary and secondary colors#887
Open
stavrosfa wants to merge 3 commits intoC7-Game:Developmentfrom
Open
Conversation
…try and avoid duplicates. Also moved the shader caching as well as the new color calculations to a new Util class as they are specific to the gameplay and not the pure loading of files/colors
TomWerner
approved these changes
Feb 16, 2026
| private static Dictionary<int, ShaderMaterial> materialCache = []; | ||
| private static Dictionary<ID, int> colorsInUseCache = []; | ||
|
|
||
| public static int GetPlayerColor(this Player player) { |
Contributor
There was a problem hiding this comment.
Could you document what the returned int is? Is it the key in the material cache?
| if (colorsInUseCache.TryGetValue(player.id, out int colorIndex)) | ||
| return colorIndex; | ||
|
|
||
| if (colorsInUseCache.ContainsValue(player.primaryColorIndex)) { |
Contributor
There was a problem hiding this comment.
Would this be an accurate comment?
// If the player's primary color is in use, fall back to their secondary color.
// This may already be in use, but that's ok; we don't have a third
// color for each civ to fall back to.
Contributor
There was a problem hiding this comment.
And maybe document how this interacts with the second run in InitializeCivColors?
Contributor
Author
|
I added some documentation, let me know if it makes sense |
Contributor
|
Perfect, thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Implemented primary and secondary colors, with some functionality to try and avoid duplicates.
Also moved the shader caching, as well as the new color calculations to a new Util class as they are specific to the gameplay and not the pure loading of files/colors