From 15968dc891ad0c39983edd0bbb7673ab81ddea81 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Thu, 15 Jun 2023 23:16:37 +0900 Subject: [PATCH 1/4] Update dependencies --- .../osu.Server.DifficultyCalculator.csproj | 14 +++++++------- .../osu.Server.Queues.BeatmapProcessor.csproj | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj index 48ffef2..c5655d9 100644 --- a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj +++ b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj @@ -10,18 +10,18 @@ true - + - + - - - - - + + + + + diff --git a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj index 2893bff..efe0a95 100644 --- a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj +++ b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj @@ -10,9 +10,8 @@ - - - + + From 33525e50f07148b486109e4c5ef2d317c4042ed2 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Mon, 31 Jul 2023 15:32:41 +0900 Subject: [PATCH 2/4] Update dependencies --- osu.Server.DifficultyCalculator/BeatmapLoader.cs | 2 +- .../osu.Server.DifficultyCalculator.csproj | 14 +++++++------- .../osu.Server.Queues.BeatmapProcessor.csproj | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/osu.Server.DifficultyCalculator/BeatmapLoader.cs b/osu.Server.DifficultyCalculator/BeatmapLoader.cs index e9d8b15..8950ecb 100644 --- a/osu.Server.DifficultyCalculator/BeatmapLoader.cs +++ b/osu.Server.DifficultyCalculator/BeatmapLoader.cs @@ -121,7 +121,7 @@ private LoaderWorkingBeatmap(Beatmap beatmap) } protected override IBeatmap GetBeatmap() => beatmap; - protected override Texture? GetBackground() => null; + public override Texture? GetBackground() => null; protected override Track? GetBeatmapTrack() => null; protected override ISkin? GetSkin() => null; public override Stream? GetStream(string storagePath) => null; diff --git a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj index c5655d9..aefcb4d 100644 --- a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj +++ b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj @@ -10,18 +10,18 @@ true - + - - - - - - + + + + + + diff --git a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj index efe0a95..6667b8a 100644 --- a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj +++ b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj @@ -10,7 +10,7 @@ - + From 842edbe462f77b8aa18a07bae8ca3664a2c573b9 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Mon, 31 Jul 2023 15:34:20 +0900 Subject: [PATCH 3/4] Write legacy scoring values to database --- .../ServerDifficultyCalculator.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs b/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs index 1e667ae..5105297 100644 --- a/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs +++ b/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs @@ -72,7 +72,10 @@ public void ProcessBeatmap(WorkingBeatmap beatmap) private void computeDifficulty(int beatmapId, WorkingBeatmap beatmap, Ruleset ruleset, MySqlConnection conn) { - foreach (var attribute in ruleset.CreateDifficultyCalculator(beatmap).CalculateAllLegacyCombinations()) + var difficultyCalculator = ruleset.CreateDifficultyCalculator(beatmap); + difficultyCalculator.ComputeLegacyScoringValues = true; + + foreach (var attribute in difficultyCalculator.CalculateAllLegacyCombinations()) { if (dryRun) continue; From 458e869c759923c4f511a8958f35d7943eafe761 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Mon, 31 Jul 2023 15:41:14 +0900 Subject: [PATCH 4/4] Revert to non-beta MySqlConnector package --- .../osu.Server.DifficultyCalculator.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj index aefcb4d..3588352 100644 --- a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj +++ b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj @@ -16,7 +16,7 @@ - +