diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs b/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs index bbf5897282..280185ba17 100644 --- a/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs +++ b/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs @@ -125,7 +125,7 @@ namespace osu.Game.Beatmaps.Drawables .Select(attr => new OsuSpriteText { Font = OsuFont.Style.Caption1, - Text = $@"{attr.Acronym}: {attr.Value:0.##}" + Text = $@"{attr.Acronym}: {attr.AdjustedValue:0.##}" }); difficultyFillFlowContainer.Clear(); diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs index 8ec7f37658..4df7e18997 100644 --- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs +++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs @@ -86,8 +86,8 @@ namespace osu.Game.Overlays.Mods { foreach (var attribute in data.Attributes) { - if (!Precision.AlmostEquals(attribute.Value, attribute.AdjustedValue)) - attributesFillFlow.Add(new AttributeDisplay(attribute.Acronym, attribute.Value, attribute.AdjustedValue)); + if (!Precision.AlmostEquals(attribute.OriginalValue, attribute.AdjustedValue)) + attributesFillFlow.Add(new AttributeDisplay(attribute.Acronym, attribute.OriginalValue, attribute.AdjustedValue)); } } diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs index b74e9b1273..f714cb3798 100644 --- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs +++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs @@ -178,7 +178,7 @@ namespace osu.Game.Overlays.Mods display.Label = attribute.Acronym; display.Current.Value = attribute.AdjustedValue; - display.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(attribute.Value, attribute.AdjustedValue); + display.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(attribute.OriginalValue, attribute.AdjustedValue); display.Alpha = 1; } diff --git a/osu.Game/Rulesets/Difficulty/RulesetBeatmapDifficulty.cs b/osu.Game/Rulesets/Difficulty/RulesetBeatmapDifficulty.cs index fb105d5050..6bad79ccb1 100644 --- a/osu.Game/Rulesets/Difficulty/RulesetBeatmapDifficulty.cs +++ b/osu.Game/Rulesets/Difficulty/RulesetBeatmapDifficulty.cs @@ -17,14 +17,14 @@ namespace osu.Game.Rulesets.Difficulty /// /// The long label for this beatmap attribute. /// A two-letter acronym for this beatmap attribute. - /// The value of this attribute before application of mods. + /// The value of this attribute before application of mods. /// The "effective" value of this attribute after application of mods. /// The lowest allowable value of this attribute. /// The highest allowable value of this attribute. public record RulesetBeatmapAttribute( LocalisableString Label, string Acronym, - float Value, + float OriginalValue, float AdjustedValue, float MinValue, float MaxValue); diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs index a4e113ce6f..95c4d94abc 100644 --- a/osu.Game/Screens/Select/Details/AdvancedStats.cs +++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs @@ -181,7 +181,7 @@ namespace osu.Game.Screens.Select.Details display.Title = attribute.Label; display.MaxValue = attribute.MaxValue; - display.Value = (attribute.Value, attribute.AdjustedValue); + display.Value = (attribute.OriginalValue, attribute.AdjustedValue); display.Alpha = 1; } diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge_StatisticDifficulty.cs b/osu.Game/Screens/SelectV2/BeatmapTitleWedge_StatisticDifficulty.cs index 55bfa3e360..65d8ba3951 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge_StatisticDifficulty.cs +++ b/osu.Game/Screens/SelectV2/BeatmapTitleWedge_StatisticDifficulty.cs @@ -195,7 +195,7 @@ namespace osu.Game.Screens.SelectV2 public record Data(LocalisableString Label, float Value, float AdjustedValue, float Maximum, string? Content = null) { public Data(RulesetBeatmapAttribute attribute) - : this(attribute.Label, attribute.Value, attribute.AdjustedValue, attribute.MaxValue) + : this(attribute.Label, attribute.OriginalValue, attribute.AdjustedValue, attribute.MaxValue) { } }