sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Apply review changes and suggestions

Browse Source
This commit is contained in:
Joseph Madamba
2018-03-25 10:00:30 -07:00
parent 78a7564acd
commit 90d763fda5
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -30,6 +30,7 @@ namespace osu.Game.Overlays.Mods
protected Color4 LowMultiplierColour, HighMultiplierColour, RankedColour;
protected readonly TriangleButton DeselectAllButton;
protected readonly OsuSpriteText ScoreLabel;
protected readonly OsuSpriteText MultiplierLabel;
protected readonly OsuSpriteText RankedLabel;
private readonly FillFlowContainer footerContainer;
@ -56,9 +57,9 @@ namespace osu.Game.Overlays.Mods
{
SelectedMods.ValueChanged += selectedModsChanged;
LowMultiplierColour = colours.Yellow;
LowMultiplierColour = colours.Red;
HighMultiplierColour = colours.Green;
RankedColour = colours.Red;
RankedColour = colours.Blue;
if (osu != null)
Ruleset.BindTo(osu.Ruleset);
@ -99,6 +100,14 @@ namespace osu.Game.Overlays.Mods
ranked &= mod.Ranked;
}
ScoreLabel.Text = "Score Multiplier:";
if (multiplier > 1.0)
ScoreLabel.FadeColour(HighMultiplierColour, 200);
else if (multiplier < 1.0)
ScoreLabel.FadeColour(LowMultiplierColour, 200);
else
ScoreLabel.FadeColour(Color4.White, 200);
MultiplierLabel.Text = $"{multiplier:N2}x";
if (multiplier > 1.0)
MultiplierLabel.FadeColour(HighMultiplierColour, 200);
@ -110,14 +119,11 @@ namespace osu.Game.Overlays.Mods
RankedLabel.Text = null;
if (!ranked)
{
RankedLabel.Text += " (Unranked)";
RankedLabel.Text = "(Unranked)";
RankedLabel.FadeColour(RankedColour, 200);
}
else
{
RankedLabel.Text = null;
RankedLabel.FadeColour(Color4.White, 200);
}
}
protected override void PopOut()
@ -362,14 +368,14 @@ namespace osu.Game.Overlays.Mods
Right = 20
}
},
new OsuSpriteText
ScoreLabel = new OsuSpriteText
{
Text = @"Score Multiplier: ",
TextSize = 30,
Shadow = true,
Margin = new MarginPadding
{
Top = 5
Top = 5,
Right = 10
}
},
MultiplierLabel = new OsuSpriteText
@ -389,7 +395,8 @@ namespace osu.Game.Overlays.Mods
Shadow = true,
Margin = new MarginPadding
{
Top = 5
Top = 5,
Left = 10
}
}
}