sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-25 23:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use tuple to avoid potential for incorrect display

Browse Source
This commit is contained in:
Dean Herbert 2019-12-18 17:12:41 +09:00
parent e87aa281bf
commit ada2ae2b2c
1 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
osu.Game/Screens/Select/Details/AdvancedStats.cs
View File

@ -68,12 +68,12 @@ namespace osu.Game.Screens.Select.Details
private void updateStatistics() private void updateStatistics()
{ {
var baseDifficulty = Beatmap?.BaseDifficulty; BeatmapDifficulty baseDifficulty = Beatmap?.BaseDifficulty;
var adjustedDifficulty = baseDifficulty; BeatmapDifficulty adjustedDifficulty = null;
if (baseDifficulty != null && mods.Value.Any(m => m is IApplicableToDifficulty)) if (baseDifficulty != null && mods.Value.Any(m => m is IApplicableToDifficulty))
{ {
adjustedDifficulty = adjustedDifficulty?.Clone(); adjustedDifficulty = baseDifficulty.Clone();
foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>()) foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
mod.ApplyToDifficulty(adjustedDifficulty); mod.ApplyToDifficulty(adjustedDifficulty);
@ -83,24 +83,19 @@ namespace osu.Game.Screens.Select.Details
if ((Beatmap?.Ruleset?.ID ?? 0) == 3) if ((Beatmap?.Ruleset?.ID ?? 0) == 3)
{ {
firstValue.Title = "Key Amount"; firstValue.Title = "Key Amount";
firstValue.BaseValue = (int)MathF.Round(baseDifficulty?.CircleSize ?? 0); firstValue.Value = ((int)MathF.Round(baseDifficulty?.CircleSize ?? 0), (int)MathF.Round(adjustedDifficulty?.CircleSize ?? 0));
firstValue.ModdedValue = (int)MathF.Round(adjustedDifficulty?.CircleSize ?? 0);
} }
else else
{ {
firstValue.Title = "Circle Size"; firstValue.Title = "Circle Size";
firstValue.BaseValue = baseDifficulty?.CircleSize ?? 0; firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
firstValue.ModdedValue = adjustedDifficulty?.CircleSize ?? 0;
} }
hpDrain.BaseValue = baseDifficulty?.DrainRate ?? 0; starDifficulty.Value = ((float)(Beatmap?.StarDifficulty ?? 0), null);
accuracy.BaseValue = baseDifficulty?.OverallDifficulty ?? 0;
approachRate.BaseValue = baseDifficulty?.ApproachRate ?? 0;
starDifficulty.BaseValue = (float)(Beatmap?.StarDifficulty ?? 0);
hpDrain.ModdedValue = adjustedDifficulty?.DrainRate ?? 0; hpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate);
accuracy.ModdedValue = adjustedDifficulty?.OverallDifficulty ?? 0; accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
approachRate.ModdedValue = adjustedDifficulty?.ApproachRate ?? 0; approachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
} }
private class StatisticRow : Container, IHasAccentColour private class StatisticRow : Container, IHasAccentColour
@ -110,7 +105,7 @@ namespace osu.Game.Screens.Select.Details
private readonly float maxValue; private readonly float maxValue;
private readonly bool forceDecimalPlaces; private readonly bool forceDecimalPlaces;
private readonly OsuSpriteText name, value; private readonly OsuSpriteText name, valueText;
private readonly Bar bar, modBar; private readonly Bar bar, modBar;
[Resolved] [Resolved]
@ -122,36 +117,29 @@ namespace osu.Game.Screens.Select.Details
set => name.Text = value; set => name.Text = value;
} }
private float baseValue; private (float baseValue, float? adjustedValue) value;
private float moddedValue; public (float baseValue, float? adjustedValue) Value
public float BaseValue
{ {
get => baseValue; get => value;
set set
{ {
baseValue = value; if (value == this.value)
bar.Length = value / maxValue; return;
this.value.Text = value.ToString(forceDecimalPlaces ? "0.00" : "0.##");
}
}
public float ModdedValue this.value = value;
{
get => moddedValue;
set
{
moddedValue = value;
modBar.Length = value / maxValue;
this.value.Text = value.ToString(forceDecimalPlaces ? "0.00" : "0.##");
if (moddedValue > baseValue) bar.Length = value.baseValue / maxValue;
modBar.AccentColour = this.value.Colour = colours.Red;
else if (moddedValue < baseValue) valueText.Text = (value.adjustedValue ?? value.baseValue).ToString(forceDecimalPlaces ? "0.00" : "0.##");
modBar.AccentColour = this.value.Colour = colours.BlueDark; modBar.Length = (value.adjustedValue ?? 0) / maxValue;
if (value.adjustedValue > value.baseValue)
modBar.AccentColour = valueText.Colour = colours.Red;
else if (value.adjustedValue < value.baseValue)
modBar.AccentColour = valueText.Colour = colours.BlueDark;
else else
modBar.AccentColour = this.value.Colour = Color4.White; modBar.AccentColour = valueText.Colour = Color4.White;
} }
} }
@ -203,7 +191,7 @@ namespace osu.Game.Screens.Select.Details
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Width = value_width, Width = value_width,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Child = value = new OsuSpriteText Child = valueText = new OsuSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,