RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-04 13:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect calculation of difficulty

Browse Source
This commit is contained in:
Dan Balasescu 2023-06-24 00:58:45 +09:00
parent bfa449e47a
commit 87447f41d0
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Catch/Difficulty/CatchScoreV1Processor.cs
View File

@ -64,11 +64,19 @@ namespace osu.Game.Rulesets.Catch.Difficulty
int objectCount = countNormal + countSlider + countSpinner; int objectCount = countNormal + countSlider + countSpinner;
int drainLength = 0;
if (baseBeatmap.HitObjects.Count > 0)
{
int breakLength = baseBeatmap.Breaks.Select(b => (int)Math.Round(b.EndTime) - (int)Math.Round(b.StartTime)).Sum();
drainLength = ((int)Math.Round(baseBeatmap.HitObjects[^1].StartTime) - (int)Math.Round(baseBeatmap.HitObjects[0].StartTime) - breakLength) / 1000;
}
int difficultyPeppyStars = (int)Math.Round( int difficultyPeppyStars = (int)Math.Round(
(baseBeatmap.Difficulty.DrainRate (baseBeatmap.Difficulty.DrainRate
+ baseBeatmap.Difficulty.OverallDifficulty + baseBeatmap.Difficulty.OverallDifficulty
+ baseBeatmap.Difficulty.CircleSize + baseBeatmap.Difficulty.CircleSize
+ Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5); + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier); scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);

10
osu.Game.Rulesets.Osu/Difficulty/OsuScoreV1Processor.cs
View File

@ -67,11 +67,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty
int objectCount = countNormal + countSlider + countSpinner; int objectCount = countNormal + countSlider + countSpinner;
int drainLength = 0;
if (baseBeatmap.HitObjects.Count > 0)
{
int breakLength = baseBeatmap.Breaks.Select(b => (int)Math.Round(b.EndTime) - (int)Math.Round(b.StartTime)).Sum();
drainLength = ((int)Math.Round(baseBeatmap.HitObjects[^1].StartTime) - (int)Math.Round(baseBeatmap.HitObjects[0].StartTime) - breakLength) / 1000;
}
int difficultyPeppyStars = (int)Math.Round( int difficultyPeppyStars = (int)Math.Round(
(baseBeatmap.Difficulty.DrainRate (baseBeatmap.Difficulty.DrainRate
+ baseBeatmap.Difficulty.OverallDifficulty + baseBeatmap.Difficulty.OverallDifficulty
+ baseBeatmap.Difficulty.CircleSize + baseBeatmap.Difficulty.CircleSize
+ Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5); + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier); scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);

10
osu.Game.Rulesets.Taiko/Difficulty/TaikoScoreV1Processor.cs
View File

@ -70,11 +70,19 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
int objectCount = countNormal + countSlider + countSpinner; int objectCount = countNormal + countSlider + countSpinner;
int drainLength = 0;
if (baseBeatmap.HitObjects.Count > 0)
{
int breakLength = baseBeatmap.Breaks.Select(b => (int)Math.Round(b.EndTime) - (int)Math.Round(b.StartTime)).Sum();
drainLength = ((int)Math.Round(baseBeatmap.HitObjects[^1].StartTime) - (int)Math.Round(baseBeatmap.HitObjects[0].StartTime) - breakLength) / 1000;
}
difficultyPeppyStars = (int)Math.Round( difficultyPeppyStars = (int)Math.Round(
(baseBeatmap.Difficulty.DrainRate (baseBeatmap.Difficulty.DrainRate
+ baseBeatmap.Difficulty.OverallDifficulty + baseBeatmap.Difficulty.OverallDifficulty
+ baseBeatmap.Difficulty.CircleSize + baseBeatmap.Difficulty.CircleSize
+ Math.Clamp(objectCount / baseBeatmap.Difficulty.DrainRate * 8, 0, 16)) / 38 * 5); + Math.Clamp(objectCount / drainLength * 8, 0, 16)) / 38 * 5);
modMultiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier); modMultiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);