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

Initialise colours section with default combo colours if none present #30108

Merged
merged 3 commits into from
Oct 4, 2024

Conversation

bdach
Copy link
Collaborator

@bdach bdach commented Oct 4, 2024

Closes #30100.

This will look incorrect with argon skin because it overrides combo colours in a weird place:

Configuration.CustomComboColours = new List<Color4>
{
// Standard combo progression order is green - blue - red - yellow.
// But for whatever reason, this starts from index 1, not 0.
//
// We've added two new combo colours in argon, so to ensure the initial rotation matches,
// this same progression is in slots 1 - 4.
// Orange
new Color4(241, 116, 0, 255),
// Green
new Color4(0, 241, 53, 255),
// Blue
new Color4(0, 82, 241, 255),
// Red
new Color4(241, 0, 0, 255),
// Yellow
new Color4(232, 235, 0, 255),
// Purple
new Color4(92, 0, 241, 255),
};
}

but I'm not super sure or even willing to figure out how to access that from within the editor.

@bdach bdach changed the title Initialise colours section with default combo colours if none present Initialise colours section with default combo colours if none present Oct 4, 2024
@peppy
Copy link
Member

peppy commented Oct 4, 2024

This will look incorrect with argon skin because it overrides combo colours in a weird place

For mapping purposes, we always want to use the default colours, not per-skin. The per-skin colours are overrides for when a user explicitly disabled beatmap colours. Although that brings up something that I may have failed to mention: the defaults aren't stored to the beatmap unless the user makes a change to them:

Jump.Desktop.2024-10-04.at.09.13.38.mp4

@bdach
Copy link
Collaborator Author

bdach commented Oct 4, 2024

Although that brings up something that I may have failed to mention: the defaults aren't stored to the beatmap unless the user makes a change to them

That's how this PR is supposed to work - see the weird bidirectional bindings I did to the beatmap skin colours instead of straight binding, which is supposed to ensure this.

@peppy
Copy link
Member

peppy commented Oct 4, 2024

Okay cool, just checking before I dive in.

@peppy peppy self-requested a review October 4, 2024 09:33
@peppy peppy merged commit 4fc0aae into ppy:master Oct 4, 2024
8 of 9 checks passed
@bdach bdach deleted the default-combo-colours-in-editor branch October 4, 2024 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Editor combo colours should start populated with the defaults
2 participants