h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 05:22:54 +08:00
Code Issues Releases Wiki Activity

Just use yellow for system mods

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-11-06 16:40:57 +01:00
parent 4bc36a6c90
commit a136f272cf
No known key found for this signature in database
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/OsuColour.cs
View File

@ -162,7 +162,7 @@ namespace osu.Game.Graphics
return Pink1;
case ModType.System:
return Gray5;
return Yellow;
default:
throw new ArgumentOutOfRangeException(nameof(modType), modType, "Unknown mod type");

4
osu.Game/Rulesets/UI/ModIcon.cs
View File

@ -204,9 +204,7 @@ namespace osu.Game.Rulesets.UI
private void updateColour()
{
modAcronym.Colour = modIcon.Colour = mod.Type != ModType.System
? OsuColour.Gray(84)
: colours.Yellow;
modAcronym.Colour = modIcon.Colour = OsuColour.Gray(84);
extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);

6
osu.Game/Rulesets/UI/ModSwitchSmall.cs
View File

@ -88,12 +88,10 @@ namespace osu.Game.Rulesets.UI
var modTypeColour = colours.ForModType(mod.Type);
inactiveForegroundColour = colourProvider?.Background5 ?? colours.Gray3;
activeForegroundColour = mod.Type != ModType.System ? modTypeColour : colours.Yellow;
activeForegroundColour = modTypeColour;
inactiveBackgroundColour = colourProvider?.Background2 ?? colours.Gray5;
activeBackgroundColour = mod.Type != ModType.System
? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1)
: modTypeColour;
activeBackgroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1);
}
protected override void LoadComplete()

4
osu.Game/Rulesets/UI/ModSwitchTiny.cs
View File

@ -112,9 +112,7 @@ namespace osu.Game.Rulesets.UI
activeBackgroundColour = modTypeColour;
inactiveForegroundColour = colourProvider?.Background2 ?? colours.Gray5;
activeForegroundColour = Mod.Type != ModType.System
? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1)
: colours.Yellow;
activeForegroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1);
}
protected override void LoadComplete()