diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 3777365088..9a0cdb387d 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Beatmaps
/// The to get the difficulty of.
/// An optional which stops updating the star difficulty for the given .
/// A bindable that is updated to contain the star difficulty when it becomes available. Will be null while in an initial calculating state (but not during updates to ruleset and mods if a stale value is already propagated).
- public IBindable GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
+ public IBindable GetBindableDifficulty([NotNull] IBeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
{
var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
@@ -99,42 +99,45 @@ namespace osu.Game.Beatmaps
}
///
- /// Retrieves a bindable containing the star difficulty of a with a given and combination.
+ /// Retrieves a bindable containing the star difficulty of a with a given and combination.
///
///
/// The bindable will not update to follow the currently-selected ruleset and mods or its settings.
///
- /// The to get the difficulty of.
- /// The to get the difficulty with. If null, the 's ruleset is used.
+ /// The to get the difficulty of.
+ /// The to get the difficulty with. If null, the 's ruleset is used.
/// The s to get the difficulty with. If null, no mods will be assumed.
- /// An optional which stops updating the star difficulty for the given .
+ /// An optional which stops updating the star difficulty for the given .
/// A bindable that is updated to contain the star difficulty when it becomes available. Will be null while in an initial calculating state.
- public IBindable GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable mods,
+ public IBindable GetBindableDifficulty([NotNull] IBeatmapInfo beatmapInfo, [CanBeNull] IRulesetInfo rulesetInfo, [CanBeNull] IEnumerable mods,
CancellationToken cancellationToken = default)
=> createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
///
- /// Retrieves the difficulty of a .
+ /// Retrieves the difficulty of a .
///
- /// The to get the difficulty of.
- /// The to get the difficulty with.
+ /// The to get the difficulty of.
+ /// The to get the difficulty with.
/// The s to get the difficulty with.
/// An optional which stops computing the star difficulty.
/// The .
- public virtual Task GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null,
+ public virtual Task GetDifficultyAsync([NotNull] IBeatmapInfo beatmapInfo, [CanBeNull] IRulesetInfo rulesetInfo = null,
[CanBeNull] IEnumerable mods = null, CancellationToken cancellationToken = default)
{
// In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
rulesetInfo ??= beatmapInfo.Ruleset;
+ var localBeatmapInfo = beatmapInfo as BeatmapInfo;
+ var localRulesetInfo = rulesetInfo as RulesetInfo;
+
// Difficulty can only be computed if the beatmap and ruleset are locally available.
- if (beatmapInfo.ID == 0 || rulesetInfo.ID == null)
+ if (localBeatmapInfo == null || localRulesetInfo == null)
{
// If not, fall back to the existing star difficulty (e.g. from an online source).
- return Task.FromResult(new StarDifficulty(beatmapInfo.StarDifficulty, beatmapInfo.MaxCombo ?? 0));
+ return Task.FromResult(new StarDifficulty(beatmapInfo.StarRating, (beatmapInfo as IBeatmapOnlineInfo)?.MaxCombo ?? 0));
}
- return GetAsync(new DifficultyCacheLookup(beatmapInfo, rulesetInfo, mods), cancellationToken);
+ return GetAsync(new DifficultyCacheLookup(localBeatmapInfo, localRulesetInfo, mods), cancellationToken);
}
protected override Task ComputeValueAsync(DifficultyCacheLookup lookup, CancellationToken token = default)
@@ -227,12 +230,12 @@ namespace osu.Game.Beatmaps
///
/// Creates a new and triggers an initial value update.
///
- /// The that star difficulty should correspond to.
- /// The initial to get the difficulty with.
+ /// The that star difficulty should correspond to.
+ /// The initial to get the difficulty with.
/// The initial s to get the difficulty with.
- /// An optional which stops updating the star difficulty for the given .
+ /// An optional which stops updating the star difficulty for the given .
/// The .
- private BindableStarDifficulty createBindable([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo initialRulesetInfo, [CanBeNull] IEnumerable initialMods,
+ private BindableStarDifficulty createBindable([NotNull] IBeatmapInfo beatmapInfo, [CanBeNull] IRulesetInfo initialRulesetInfo, [CanBeNull] IEnumerable initialMods,
CancellationToken cancellationToken)
{
var bindable = new BindableStarDifficulty(beatmapInfo, cancellationToken);
@@ -244,12 +247,12 @@ namespace osu.Game.Beatmaps
/// Updates the value of a with a given ruleset + mods.
///
/// The to update.
- /// The to update with.
+ /// The to update with.
/// The s to update with.
/// A token that may be used to cancel this update.
- private void updateBindable([NotNull] BindableStarDifficulty bindable, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable mods, CancellationToken cancellationToken = default)
+ private void updateBindable([NotNull] BindableStarDifficulty bindable, [CanBeNull] IRulesetInfo rulesetInfo, [CanBeNull] IEnumerable mods, CancellationToken cancellationToken = default)
{
- // GetDifficultyAsync will fall back to existing data from BeatmapInfo if not locally available
+ // GetDifficultyAsync will fall back to existing data from IBeatmapInfo if not locally available
// (contrary to GetAsync)
GetDifficultyAsync(bindable.BeatmapInfo, rulesetInfo, mods, cancellationToken)
.ContinueWith(t =>
@@ -343,10 +346,10 @@ namespace osu.Game.Beatmaps
private class BindableStarDifficulty : Bindable
{
- public readonly BeatmapInfo BeatmapInfo;
+ public readonly IBeatmapInfo BeatmapInfo;
public readonly CancellationToken CancellationToken;
- public BindableStarDifficulty(BeatmapInfo beatmapInfo, CancellationToken cancellationToken)
+ public BindableStarDifficulty(IBeatmapInfo beatmapInfo, CancellationToken cancellationToken)
{
BeatmapInfo = beatmapInfo;
CancellationToken = cancellationToken;