RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add OD display and fix "*" difficuty modifier display

This commit is contained in:
Dean Herbert 2018-11-22 14:10:33 +09:00
parent 7d3bcdfc17
commit cbf82f892d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tournament/Components/SongBar.cs
View File

@ -158,17 +158,22 @@ private void update()
var bpm = beatmap.BeatmapSet.OnlineInfo.BPM;
var length = beatmap.OnlineInfo.Length;
string extra = "";
string hardRockExtra = "";
string srExtra = "";
var ar = beatmap.BaseDifficulty.ApproachRate;
if ((mods & LegacyMods.HardRock) > 0) extra = "*";
if ((mods & LegacyMods.HardRock) > 0)
{
hardRockExtra = "*";
srExtra = "*";
}
if ((mods & LegacyMods.DoubleTime) > 0)
{
//ar *= 1.5f;
bpm *= 1.5f;
length /= 1.5f;
extra = "*";
srExtra = "*";
}
panelContents.Children = new Drawable[]
@ -191,7 +196,7 @@ private void update()
},
new OsuSpriteText
{
Text = $"CS {beatmap.BaseDifficulty.CircleSize:0.#} / AR {ar:0.#}{extra}",
Text = $"CS {beatmap.BaseDifficulty.CircleSize:0.#}{hardRockExtra} / AR {ar:0.#}{srExtra} / OD {beatmap.BaseDifficulty.OverallDifficulty:0.#}{hardRockExtra}",
Margin = new MarginPadding { Horizontal = 15, Vertical = 5 },
Colour = OsuColour.Gray(0.33f),
Anchor = Anchor.TopRight,
@ -199,7 +204,7 @@ private void update()
},
new OsuSpriteText
{
Text = $"Star Rating {beatmap.StarDifficulty:0.#}{extra}",
Text = $"Star Rating {beatmap.StarDifficulty:0.#}{srExtra}",
Margin = new MarginPadding { Horizontal = 15, Vertical = 5 },
Colour = OsuColour.Gray(0.33f),
Anchor = Anchor.BottomRight,