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

Merge pull request #30195 from bdach/advanced-stats-stupid-shenanigans 

Fix crashes when attempting to change from a custom ruleset with mods selected to another
This commit is contained in:
Dean Herbert 2024-10-11 00:57:28 +09:00 committed by GitHub
parent 245d05a2e2 687bdad389
commit 14ecd56913
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
View File

@ -84,7 +84,7 @@ public void TestEasyMod()
AddStep("select EZ mod", () =>
{
var ruleset = advancedStats.BeatmapInfo.Ruleset.CreateInstance().AsNonNull();
SelectedMods.Value = new[] { ruleset.CreateMod<ModEasy>() };
advancedStats.Mods.Value = new[] { ruleset.CreateMod<ModEasy>() };
});
AddAssert("circle size bar is blue", () => barIsBlue(advancedStats.FirstValue));
@ -101,7 +101,7 @@ public void TestHardRockMod()
AddStep("select HR mod", () =>
{
var ruleset = advancedStats.BeatmapInfo.Ruleset.CreateInstance().AsNonNull();
SelectedMods.Value = new[] { ruleset.CreateMod<ModHardRock>() };
advancedStats.Mods.Value = new[] { ruleset.CreateMod<ModHardRock>() };
});
AddAssert("circle size bar is red", () => barIsRed(advancedStats.FirstValue));
@ -120,7 +120,7 @@ public void TestUnchangedDifficultyAdjustMod()
var ruleset = advancedStats.BeatmapInfo.Ruleset.CreateInstance().AsNonNull();
var difficultyAdjustMod = ruleset.CreateMod<ModDifficultyAdjust>().AsNonNull();
difficultyAdjustMod.ReadFromDifficulty(advancedStats.BeatmapInfo.Difficulty);
SelectedMods.Value = new[] { difficultyAdjustMod };
advancedStats.Mods.Value = new[] { difficultyAdjustMod };
});
AddAssert("circle size bar is white", () => barIsWhite(advancedStats.FirstValue));
@ -143,7 +143,7 @@ public void TestChangedDifficultyAdjustMod()
difficultyAdjustMod.ReadFromDifficulty(originalDifficulty);
difficultyAdjustMod.DrainRate.Value = originalDifficulty.DrainRate - 0.5f;
difficultyAdjustMod.ApproachRate.Value = originalDifficulty.ApproachRate + 2.2f;
SelectedMods.Value = new[] { difficultyAdjustMod };
advancedStats.Mods.Value = new[] { difficultyAdjustMod };
});
AddAssert("circle size bar is white", () => barIsWhite(advancedStats.FirstValue));

12
osu.Game/Overlays/BeatmapSetOverlay.cs
View File

@ -3,8 +3,6 @@
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@ -16,8 +14,6 @@
using osu.Game.Overlays.BeatmapSet;
using osu.Game.Overlays.BeatmapSet.Scores;
using osu.Game.Overlays.Comments;
using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Select.Details;
using osuTK;
using osuTK.Graphics;
@ -37,14 +33,6 @@ public partial class BeatmapSetOverlay : OnlineOverlay<BeatmapSetHeader>
private (BeatmapSetLookupType type, int id)? lastLookup;
/// <remarks>
/// Isolates the beatmap set overlay from the game-wide selected mods bindable
/// to avoid affecting the beatmap details section (i.e. <see cref="AdvancedStats.StatisticRow"/>).
/// </remarks>
[Cached]
[Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
public BeatmapSetOverlay()
: base(OverlayColourScheme.Blue)
{

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

@ -3,6 +3,7 @@
#nullable disable
using System;
using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
@ -36,9 +37,6 @@ public partial class AdvancedStats : Container, IHasCustomTooltip<AdjustedAttrib
[Resolved]
private BeatmapDifficultyCache difficultyCache { get; set; }
[Resolved]
private IBindable<IReadOnlyList<Mod>> mods { get; set; }
protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
private readonly StatisticRow starDifficulty;
@ -69,6 +67,14 @@ public IBeatmapInfo BeatmapInfo
/// </remarks>
public Bindable<RulesetInfo> Ruleset { get; } = new Bindable<RulesetInfo>();
/// <summary>
/// Mods to be used for certain elements of display.
/// </summary>
/// <remarks>
/// No checks are done as to whether the mods specified are valid for the current <see cref="Ruleset"/>.
/// </remarks>
public Bindable<IReadOnlyList<Mod>> Mods { get; } = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
public AdvancedStats(int columns = 1)
{
switch (columns)
@ -143,8 +149,7 @@ protected override void LoadComplete()
base.LoadComplete();
Ruleset.BindValueChanged(_ => updateStatistics());
mods.BindValueChanged(modsChanged, true);
Mods.BindValueChanged(modsChanged, true);
}
private ModSettingChangeTracker modSettingChangeTracker;
@ -173,14 +178,14 @@ private void updateStatistics()
{
BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(baseDifficulty);
foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
foreach (var mod in Mods.Value.OfType<IApplicableToDifficulty>())
mod.ApplyToDifficulty(originalDifficulty);
adjustedDifficulty = originalDifficulty;
if (Ruleset.Value != null)
{
double rate = ModUtils.CalculateRateWithMods(mods.Value);
double rate = ModUtils.CalculateRateWithMods(Mods.Value);
adjustedDifficulty = Ruleset.Value.CreateInstance().GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
@ -198,7 +203,7 @@ private void updateStatistics()
// For the time being, the key count is static no matter what, because:
// a) The method doesn't have knowledge of the active keymods. Doing so may require considerations for filtering.
// b) Using the difficulty adjustment mod to adjust OD doesn't have an effect on conversion.
int keyCount = baseDifficulty == null ? 0 : legacyRuleset.GetKeyCount(BeatmapInfo, mods.Value);
int keyCount = baseDifficulty == null ? 0 : legacyRuleset.GetKeyCount(BeatmapInfo, Mods.Value);
FirstValue.Title = BeatmapsetsStrings.ShowStatsCsMania;
FirstValue.Value = (keyCount, keyCount);
@ -236,7 +241,7 @@ private void updateStarDifficulty() => Scheduler.AddOnce(() =>
starDifficultyCancellationSource = new CancellationTokenSource();
var normalStarDifficultyTask = difficultyCache.GetDifficultyAsync(BeatmapInfo, Ruleset.Value, null, starDifficultyCancellationSource.Token);
var moddedStarDifficultyTask = difficultyCache.GetDifficultyAsync(BeatmapInfo, Ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
var moddedStarDifficultyTask = difficultyCache.GetDifficultyAsync(BeatmapInfo, Ruleset.Value, Mods.Value, starDifficultyCancellationSource.Token);
Task.WhenAll(normalStarDifficultyTask, moddedStarDifficultyTask).ContinueWith(_ => Schedule(() =>
{

13
osu.Game/Screens/Select/SongSelect.cs
View File

@ -610,11 +610,6 @@ private void performUpdateSelected()
beatmapInfoPrevious = beatmap;
}
// we can't run this in the debounced run due to the selected mods bindable not being debounced,
// since mods could be updated to the new ruleset instances while the decoupled bindable is held behind,
// therefore resulting in performing difficulty calculation with invalid states.
advancedStats.Ruleset.Value = ruleset;
void run()
{
// clear pending task immediately to track any potential nested debounce operation.
@ -878,6 +873,8 @@ private void updateComponentFromBeatmap(WorkingBeatmap beatmap)
ModSelect.Beatmap.Value = beatmap;
advancedStats.BeatmapInfo = beatmap.BeatmapInfo;
advancedStats.Mods.Value = selectedMods.Value;
advancedStats.Ruleset.Value = Ruleset.Value;
bool beatmapSelected = beatmap is not DummyWorkingBeatmap;
@ -990,6 +987,12 @@ private void bindBindables()
Beatmap.BindValueChanged(updateCarouselSelection);
selectedMods.BindValueChanged(_ =>
{
if (decoupledRuleset.Value.Equals(rulesetNoDebounce))
advancedStats.Mods.Value = selectedMods.Value;
}, true);
boundLocalBindables = true;
}