h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-07 05:47:18 +08:00
Code Issues Releases Wiki Activity

Merge pull request #30802 from cloudrac3r/patch-1

Browse Source 
Use consistent decimal places in BeatmapAttributeText
This commit is contained in:
Bartłomiej Dach 2024-11-21 14:32:25 +01:00 committed by GitHub
commit 23ef8fd909
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapAttributeText.cs
View File

@ -73,10 +73,10 @@ namespace osu.Game.Tests.Visual.UserInterface
});
});
[TestCase(BeatmapAttribute.CircleSize, "Circle Size: 1.00")]
[TestCase(BeatmapAttribute.HPDrain, "HP Drain: 2.00")]
[TestCase(BeatmapAttribute.Accuracy, "Accuracy: 3.00")]
[TestCase(BeatmapAttribute.ApproachRate, "Approach Rate: 4.00")]
[TestCase(BeatmapAttribute.CircleSize, "Circle Size: 1")]
[TestCase(BeatmapAttribute.HPDrain, "HP Drain: 2")]
[TestCase(BeatmapAttribute.Accuracy, "Accuracy: 3")]
[TestCase(BeatmapAttribute.ApproachRate, "Approach Rate: 4")]
[TestCase(BeatmapAttribute.Title, "Title: _Title")]
[TestCase(BeatmapAttribute.Artist, "Artist: _Artist")]
[TestCase(BeatmapAttribute.Creator, "Creator: _Creator")]
@ -121,15 +121,15 @@ namespace osu.Game.Tests.Visual.UserInterface
Difficulty =
{
ApproachRate = 10,
CircleSize = 9
CircleSize = 9.5f
}
}
}));
test(BeatmapAttribute.BPM, new OsuModDoubleTime(), "BPM: 100.00", "BPM: 150.00");
test(BeatmapAttribute.BPM, new OsuModDoubleTime(), "BPM: 100", "BPM: 150");
test(BeatmapAttribute.Length, new OsuModDoubleTime(), "Length: 00:30", "Length: 00:20");
test(BeatmapAttribute.ApproachRate, new OsuModDoubleTime(), "Approach Rate: 10.00", "Approach Rate: 11.00");
test(BeatmapAttribute.CircleSize, new OsuModHardRock(), "Circle Size: 9.00", "Circle Size: 10.00");
test(BeatmapAttribute.ApproachRate, new OsuModDoubleTime(), "Approach Rate: 10", "Approach Rate: 11");
test(BeatmapAttribute.CircleSize, new OsuModHardRock(), "Circle Size: 9.5", "Circle Size: 10");
void test(BeatmapAttribute attribute, Mod mod, string before, string after)
{

10
osu.Game/Skinning/Components/BeatmapAttributeText.cs
View File

@ -211,19 +211,19 @@ namespace osu.Game.Skinning.Components
return beatmap.Value.BeatmapInfo.Status.GetLocalisableDescription();
case BeatmapAttribute.BPM:
return FormatUtils.RoundBPM(beatmap.Value.BeatmapInfo.BPM, ModUtils.CalculateRateWithMods(mods.Value)).ToLocalisableString(@"F2");
return FormatUtils.RoundBPM(beatmap.Value.BeatmapInfo.BPM, ModUtils.CalculateRateWithMods(mods.Value)).ToLocalisableString(@"0.##");
case BeatmapAttribute.CircleSize:
return computeDifficulty().CircleSize.ToLocalisableString(@"F2");
return computeDifficulty().CircleSize.ToLocalisableString(@"0.##");
case BeatmapAttribute.HPDrain:
return computeDifficulty().DrainRate.ToLocalisableString(@"F2");
return computeDifficulty().DrainRate.ToLocalisableString(@"0.##");
case BeatmapAttribute.Accuracy:
return computeDifficulty().OverallDifficulty.ToLocalisableString(@"F2");
return computeDifficulty().OverallDifficulty.ToLocalisableString(@"0.##");
case BeatmapAttribute.ApproachRate:
return computeDifficulty().ApproachRate.ToLocalisableString(@"F2");
return computeDifficulty().ApproachRate.ToLocalisableString(@"0.##");
case BeatmapAttribute.StarRating:
return (starDifficulty?.Stars ?? 0).ToLocalisableString(@"F2");