osu/osu-tools
1
0
Fork 0
mirror of https://github.com/ppy/osu-tools.git synced 2025-06-11 18:20:35 +09:00
Code Activity

Pass beatmap and ruleset via ScoreInfo constructor args

Browse source
This commit is contained in:
Bartłomiej Dach 2022-01-28 20:56:06 +01:00
parent f63e59e1a1
commit 39a991938a
No known key found for this signature in database
GPG key ID: BCECCD4FA41F6497
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PerformanceCalculator/Leaderboard/LeaderboardCommand.cs
View file

@ -63,9 +63,8 @@ namespace PerformanceCalculator.Leaderboard
var modsAcronyms = ((JArray)play.mods).Select(x => x.ToString()).ToArray(); var modsAcronyms = ((JArray)play.mods).Select(x => x.ToString()).ToArray();
Mod[] mods = ruleset.CreateAllMods().Where(m => modsAcronyms.Contains(m.Acronym)).ToArray(); Mod[] mods = ruleset.CreateAllMods().Where(m => modsAcronyms.Contains(m.Acronym)).ToArray();
var scoreInfo = new ScoreInfo var scoreInfo = new ScoreInfo(working.BeatmapInfo, ruleset.RulesetInfo)
{ {
Ruleset = ruleset.RulesetInfo,
TotalScore = play.score, TotalScore = play.score,
MaxCombo = play.max_combo, MaxCombo = play.max_combo,
Mods = mods, Mods = mods,

3
PerformanceCalculator/Profile/ProfileCommand.cs
View file

@ -55,9 +55,8 @@ namespace PerformanceCalculator.Profile
var modsAcronyms = ((JArray)play.mods).Select(x => x.ToString()).ToArray(); var modsAcronyms = ((JArray)play.mods).Select(x => x.ToString()).ToArray();
Mod[] mods = ruleset.CreateAllMods().Where(m => modsAcronyms.Contains(m.Acronym)).ToArray(); Mod[] mods = ruleset.CreateAllMods().Where(m => modsAcronyms.Contains(m.Acronym)).ToArray();
var scoreInfo = new ScoreInfo var scoreInfo = new ScoreInfo(working.BeatmapInfo, ruleset.RulesetInfo)
{ {
Ruleset = ruleset.RulesetInfo,
TotalScore = play.score, TotalScore = play.score,
MaxCombo = play.max_combo, MaxCombo = play.max_combo,
Mods = mods, Mods = mods,

3
PerformanceCalculator/Simulate/SimulateCommand.cs
View file

@ -75,14 +75,13 @@ namespace PerformanceCalculator.Simulate
var difficultyCalculator = ruleset.CreateDifficultyCalculator(workingBeatmap); var difficultyCalculator = ruleset.CreateDifficultyCalculator(workingBeatmap);
var difficultyAttributes = difficultyCalculator.Calculate(LegacyHelper.TrimNonDifficultyAdjustmentMods(ruleset, mods).ToArray()); var difficultyAttributes = difficultyCalculator.Calculate(LegacyHelper.TrimNonDifficultyAdjustmentMods(ruleset, mods).ToArray());
var performanceCalculator = ruleset.CreatePerformanceCalculator(difficultyAttributes, new ScoreInfo var performanceCalculator = ruleset.CreatePerformanceCalculator(difficultyAttributes, new ScoreInfo(beatmap.BeatmapInfo, ruleset.RulesetInfo)
{ {
Accuracy = accuracy, Accuracy = accuracy,
MaxCombo = maxCombo, MaxCombo = maxCombo,
Statistics = statistics, Statistics = statistics,
Mods = mods, Mods = mods,
TotalScore = score, TotalScore = score,
Ruleset = Ruleset.RulesetInfo,
}); });
var ppAttributes = performanceCalculator?.Calculate(); var ppAttributes = performanceCalculator?.Calculate();