From a9c5c28a867539546d75dc047844483b947569b1 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 20 Sep 2023 13:50:48 +0900 Subject: [PATCH] Output `max_combo` to `osu_beatmaps` table --- osu.Server.DifficultyCalculator.sln.DotSettings | 1 + .../ServerDifficultyCalculator.cs | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/osu.Server.DifficultyCalculator.sln.DotSettings b/osu.Server.DifficultyCalculator.sln.DotSettings index 866c5b9..ec52d49 100644 --- a/osu.Server.DifficultyCalculator.sln.DotSettings +++ b/osu.Server.DifficultyCalculator.sln.DotSettings @@ -128,6 +128,7 @@ HINT WARNING WARNING + HINT HINT WARNING WARNING diff --git a/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs b/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs index 5105297..005504c 100644 --- a/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs +++ b/osu.Server.DifficultyCalculator/ServerDifficultyCalculator.cs @@ -130,21 +130,22 @@ private void computeDifficulty(int beatmapId, WorkingBeatmap beatmap, Ruleset ru OD = beatmap.Beatmap.BeatmapInfo.Difficulty.OverallDifficulty, HP = beatmap.Beatmap.BeatmapInfo.Difficulty.DrainRate, CS = beatmap.Beatmap.BeatmapInfo.Difficulty.CircleSize, - BPM = Math.Round(bpm, 2) + BPM = Math.Round(bpm, 2), + MaxCombo = attribute.MaxCombo, }; if (AppSettings.INSERT_BEATMAPS) { conn.Execute( - "INSERT INTO `osu_beatmaps` (`beatmap_id`, `difficultyrating`, `diff_approach`, `diff_overall`, `diff_drain`, `diff_size`, `bpm`) " - + "VALUES (@BeatmapId, @Diff, @AR, @OD, @HP, @CS, @BPM) " - + "ON DUPLICATE KEY UPDATE `difficultyrating` = @Diff, `diff_approach` = @AR, `diff_overall` = @OD, `diff_drain` = @HP, `diff_size` = @CS, `bpm` = @BPM", + "INSERT INTO `osu_beatmaps` (`beatmap_id`, `difficultyrating`, `diff_approach`, `diff_overall`, `diff_drain`, `diff_size`, `bpm`, `max_combo`) " + + "VALUES (@BeatmapId, @Diff, @AR, @OD, @HP, @CS, @BPM, @MaxCombo) " + + "ON DUPLICATE KEY UPDATE `difficultyrating` = @Diff, `diff_approach` = @AR, `diff_overall` = @OD, `diff_drain` = @HP, `diff_size` = @CS, `bpm` = @BPM, `max_combo` = @MaxCombo", param); } else { conn.Execute( - "UPDATE `osu_beatmaps` SET `difficultyrating` = @Diff, `diff_approach` = @AR, `diff_overall` = @OD, `diff_drain` = @HP, `diff_size` = @CS, `bpm` = @BPM " + "UPDATE `osu_beatmaps` SET `difficultyrating` = @Diff, `diff_approach` = @AR, `diff_overall` = @OD, `diff_drain` = @HP, `diff_size` = @CS, `bpm` = @BPM , `max_combo` = @MaxCombo" + "WHERE `beatmap_id` = @BeatmapId", param); }