h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 14:37:30 +08:00
Code Issues Releases Wiki Activity

Simplify implementation

Browse Source
This commit is contained in:
Dan Balasescu 2024-10-17 19:39:03 +09:00
parent d195a69447
commit bfcf6693ca
No known key found for this signature in database
2 changed files with 33 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
osu.Game/Beatmaps/BeatmapDifficultyCache.cs
View File

@ -21,7 +21,6 @@ using osu.Game.Database;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Difficulty; using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Game.Scoring; using osu.Game.Scoring;
@ -245,11 +244,35 @@ namespace osu.Game.Beatmaps
var ruleset = rulesetInfo.CreateInstance(); var ruleset = rulesetInfo.CreateInstance();
Debug.Assert(ruleset != null); Debug.Assert(ruleset != null);
PlayableCachedWorkingBeatmap working = new PlayableCachedWorkingBeatmap(beatmapManager.GetWorkingBeatmap(key.BeatmapInfo)); PlayableCachedWorkingBeatmap workingBeatmap = new PlayableCachedWorkingBeatmap(beatmapManager.GetWorkingBeatmap(key.BeatmapInfo));
IBeatmap playableBeatmap = workingBeatmap.GetPlayableBeatmap(ruleset.RulesetInfo, key.OrderedMods, cancellationToken);
var difficulty = ruleset.CreateDifficultyCalculator(working).Calculate(key.OrderedMods, cancellationToken); var difficulty = ruleset.CreateDifficultyCalculator(workingBeatmap).Calculate(key.OrderedMods, cancellationToken);
cancellationToken.ThrowIfCancellationRequested();
var performanceCalculator = ruleset.CreatePerformanceCalculator();
if (performanceCalculator == null)
return new StarDifficulty(difficulty, new PerformanceAttributes());
ScoreProcessor scoreProcessor = ruleset.CreateScoreProcessor();
scoreProcessor.Mods.Value = key.OrderedMods;
scoreProcessor.ApplyBeatmap(playableBeatmap);
cancellationToken.ThrowIfCancellationRequested();
ScoreInfo perfectScore = new ScoreInfo(key.BeatmapInfo, ruleset.RulesetInfo)
{
Passed = true,
Accuracy = 1,
Mods = key.OrderedMods,
MaxCombo = scoreProcessor.MaximumCombo,
Combo = scoreProcessor.MaximumCombo,
TotalScore = scoreProcessor.MaximumTotalScore,
Statistics = scoreProcessor.MaximumStatistics,
MaximumStatistics = scoreProcessor.MaximumStatistics
};
var performance = performanceCalculator.Calculate(perfectScore, difficulty);
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var performance = computeMaxPerformance(working, key.BeatmapInfo, ruleset, key.OrderedMods, difficulty);
return new StarDifficulty(difficulty, performance); return new StarDifficulty(difficulty, performance);
} }
@ -273,60 +296,6 @@ namespace osu.Game.Beatmaps
} }
} }
private static PerformanceAttributes computeMaxPerformance(IWorkingBeatmap working, BeatmapInfo beatmap, Ruleset ruleset, Mod[] mods, DifficultyAttributes attributes)
{
var performanceCalculator = ruleset.CreatePerformanceCalculator();
if (performanceCalculator == null)
return new PerformanceAttributes();
IBeatmap playableBeatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo, mods);
// create statistics assuming all hit objects have perfect hit result
var statistics = playableBeatmap.HitObjects
.SelectMany(getPerfectHitResults)
.GroupBy(hr => hr, (hr, list) => (hitResult: hr, count: list.Count()))
.ToDictionary(pair => pair.hitResult, pair => pair.count);
// compute maximum total score
ScoreProcessor scoreProcessor = ruleset.CreateScoreProcessor();
scoreProcessor.Mods.Value = mods;
scoreProcessor.ApplyBeatmap(playableBeatmap);
long maxScore = scoreProcessor.MaximumTotalScore;
// todo: Get max combo from difficulty calculator instead when diffcalc properly supports lazer-first scores
int maxCombo = calculateMaxCombo(playableBeatmap);
// compute maximum rank - default to SS, then adjust the rank with mods
ScoreRank maxRank = ScoreRank.X;
foreach (IApplicableToScoreProcessor mod in mods.OfType<IApplicableToScoreProcessor>())
maxRank = mod.AdjustRank(maxRank, 1);
ScoreInfo perfectScore = new ScoreInfo(beatmap, ruleset.RulesetInfo)
{
Accuracy = 1,
Passed = true,
MaxCombo = maxCombo,
Combo = maxCombo,
Mods = mods,
TotalScore = maxScore,
Statistics = statistics,
MaximumStatistics = statistics
};
return performanceCalculator.Calculate(perfectScore, attributes);
static int calculateMaxCombo(IBeatmap beatmap)
=> beatmap.HitObjects.SelectMany(getPerfectHitResults).Count(r => r.AffectsCombo());
static IEnumerable<HitResult> getPerfectHitResults(HitObject hitObject)
{
foreach (HitObject nested in hitObject.NestedHitObjects)
yield return nested.Judgement.MaxResult;
yield return hitObject.Judgement.MaxResult;
}
}
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);

6
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -119,6 +119,11 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
public long MaximumTotalScore { get; private set; } public long MaximumTotalScore { get; private set; }
/// <summary>
/// The maximum achievable combo.
/// </summary>
public int MaximumCombo { get; private set; }
/// <summary> /// <summary>
/// The maximum sum of accuracy-affecting judgements at the current point in time. /// The maximum sum of accuracy-affecting judgements at the current point in time.
/// </summary> /// </summary>
@ -423,6 +428,7 @@ namespace osu.Game.Rulesets.Scoring
MaximumResultCounts.AddRange(ScoreResultCounts); MaximumResultCounts.AddRange(ScoreResultCounts);
MaximumTotalScore = TotalScore.Value; MaximumTotalScore = TotalScore.Value;
MaximumCombo = HighestCombo.Value;
} }
ScoreResultCounts.Clear(); ScoreResultCounts.Clear();