mirror of
https://github.com/ppy/osu.git
synced 2025-02-15 14:42:56 +08:00
Update in line with upstream changes
This commit is contained in:
parent
0259ab761b
commit
fb44fb18e0
@ -128,6 +128,8 @@ namespace osu.Game.Screens.Select.Details
|
||||
IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
|
||||
BeatmapDifficulty adjustedDifficulty = null;
|
||||
|
||||
IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
|
||||
|
||||
if (baseDifficulty != null &&
|
||||
(mods.Value.Any(m => m is IApplicableToDifficulty) || mods.Value.Any(m => m is IApplicableToRate)))
|
||||
{
|
||||
@ -140,21 +142,17 @@ namespace osu.Game.Screens.Select.Details
|
||||
|
||||
if (gameRuleset != null)
|
||||
{
|
||||
Ruleset ruleset = gameRuleset.Value.CreateInstance();
|
||||
|
||||
double rate = 1;
|
||||
foreach (var mod in mods.Value.OfType<IApplicableToRate>())
|
||||
rate = mod.ApplyToRate(0, rate);
|
||||
|
||||
adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
|
||||
adjustedDifficulty = ruleset.CreateInstance().GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
|
||||
|
||||
rateAdjustTooltip.UpdateAttribute("AR", originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
|
||||
rateAdjustTooltip.UpdateAttribute("OD", originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
|
||||
}
|
||||
}
|
||||
|
||||
IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
|
||||
|
||||
switch (ruleset.OnlineID)
|
||||
{
|
||||
case 3:
|
||||
|
Loading…
Reference in New Issue
Block a user