h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 14:52:55 +08:00
Code Issues Releases Wiki Activity

Added "value is rate changed" indication

Browse Source 
Now if AR or OD value is not "true" and changed through rate - it will appear with symbol `*`
Instead of `11` it wil show as `11*`
This commit is contained in:
Givikap120 2023-08-25 01:25:12 +03:00
parent 772633178c
commit d5ac93f631
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,9 @@ namespace osu.Game.Screens.Select.Details
protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate; protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
private readonly StatisticRow starDifficulty; private readonly StatisticRow starDifficulty;
private bool isArRateAdjusted { get; set; }
private bool isOdRateAdjusted { get; set; }
private IBeatmapInfo beatmapInfo; private IBeatmapInfo beatmapInfo;
public IBeatmapInfo BeatmapInfo public IBeatmapInfo BeatmapInfo
@ -117,6 +120,8 @@ namespace osu.Game.Screens.Select.Details
{ {
IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty; IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
BeatmapDifficulty adjustedDifficulty = null; BeatmapDifficulty adjustedDifficulty = null;
isArRateAdjusted = false;
isOdRateAdjusted = false;
if (baseDifficulty != null && mods.Value.Any(m => m is IApplicableToDifficulty)) if (baseDifficulty != null && mods.Value.Any(m => m is IApplicableToDifficulty))
{ {
@ -135,8 +140,14 @@ namespace osu.Game.Screens.Select.Details
{ {
double speedChange = (float)mod.SpeedChange.Value; double speedChange = (float)mod.SpeedChange.Value;
adjustedDifficulty.ApproachRate = ruleset.ChangeArFromRate(adjustedDifficulty.ApproachRate, speedChange); float ar = adjustedDifficulty.ApproachRate;
adjustedDifficulty.OverallDifficulty = ruleset.ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, speedChange); float od = adjustedDifficulty.OverallDifficulty;
adjustedDifficulty.ApproachRate = ruleset.ChangeArFromRate(ar, speedChange);
adjustedDifficulty.OverallDifficulty = ruleset.ChangeOdFromRate(od, speedChange);
if (adjustedDifficulty.ApproachRate != ar) isArRateAdjusted = true;
if (adjustedDifficulty.OverallDifficulty != od) isOdRateAdjusted = true;
} }
} }
@ -146,18 +157,18 @@ namespace osu.Game.Screens.Select.Details
// Account for mania differences locally for now // Account for mania differences locally for now
// Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes
FirstValue.Title = BeatmapsetsStrings.ShowStatsCsMania; FirstValue.Title = BeatmapsetsStrings.ShowStatsCsMania;
FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null); FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null, false);
break; break;
default: default:
FirstValue.Title = BeatmapsetsStrings.ShowStatsCs; FirstValue.Title = BeatmapsetsStrings.ShowStatsCs;
FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize); FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize, false);
break; break;
} }
HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate); HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate, false);
Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty); Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty, isOdRateAdjusted);
ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate); ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate, isArRateAdjusted);
updateStarDifficulty(); updateStarDifficulty();
} }
@ -191,7 +202,7 @@ namespace osu.Game.Screens.Select.Details
if (normalDifficulty == null || moddedDifficulty == null) if (normalDifficulty == null || moddedDifficulty == null)
return; return;
starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars); starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars, false);
}), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current); }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
}); });
@ -222,11 +233,11 @@ namespace osu.Game.Screens.Select.Details
set => name.Text = value; set => name.Text = value;
} }
private (float baseValue, float? adjustedValue)? value; private (float baseValue, float? adjustedValue, bool isRateAdjusted)? value;
public (float baseValue, float? adjustedValue) Value public (float baseValue, float? adjustedValue, bool isRateAdjusted) Value
{ {
get => value ?? (0, null); get => value ?? (0, null, false);
set set
{ {
if (value == this.value) if (value == this.value)
@ -237,6 +248,7 @@ namespace osu.Game.Screens.Select.Details
bar.Length = value.baseValue / maxValue; bar.Length = value.baseValue / maxValue;
valueText.Text = (value.adjustedValue ?? value.baseValue).ToString(forceDecimalPlaces ? "0.00" : "0.##"); valueText.Text = (value.adjustedValue ?? value.baseValue).ToString(forceDecimalPlaces ? "0.00" : "0.##");
if (value.isRateAdjusted) valueText.Text += "*";
ModBar.Length = (value.adjustedValue ?? 0) / maxValue; ModBar.Length = (value.adjustedValue ?? 0) / maxValue;
if (Precision.AlmostEquals(value.baseValue, value.adjustedValue ?? value.baseValue, 0.05f)) if (Precision.AlmostEquals(value.baseValue, value.adjustedValue ?? value.baseValue, 0.05f))