h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 10:17:36 +08:00
Code Issues Releases Wiki Activity

Remove abusable 0.66 threshold by averaging

Browse Source
This commit is contained in:
apollo 2022-01-04 16:30:08 +00:00 committed by GitHub
commit 391110ca5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
View File

@ -25,10 +25,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
public double SliderFactor { get; set; } public double SliderFactor { get; set; }
[JsonProperty("aim_difficult_strain_count")] [JsonProperty("aim_difficult_strain_count")]
public int AimDifficultStrainCount { get; set; } public double AimDifficultStrainCount { get; set; }
[JsonProperty("speed_difficult_strain_count")] [JsonProperty("speed_difficult_strain_count")]
public int SpeedDifficultStrainCount { get; set; } public double SpeedDifficultStrainCount { get; set; }
[JsonProperty("approach_rate")] [JsonProperty("approach_rate")]
public double ApproachRate { get; set; } public double ApproachRate { get; set; }

4
osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
View File

@ -40,8 +40,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1; double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
int aimDifficultyStrainCount = ((OsuStrainSkill)skills[0]).CountDifficultStrains(clockRate); double aimDifficultyStrainCount = ((OsuStrainSkill)skills[0]).CountDifficultStrains(clockRate);
int speedDifficultyStrainCount = ((OsuStrainSkill)skills[2]).CountDifficultStrains(clockRate); double speedDifficultyStrainCount = ((OsuStrainSkill)skills[2]).CountDifficultStrains(clockRate);
if (mods.Any(h => h is OsuModRelax)) if (mods.Any(h => h is OsuModRelax))
speedRating = 0.0; speedRating = 0.0;

14
osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
View File

@ -59,15 +59,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
} }
/// <summary> /// <summary>
/// Returns the number of difficult strains. /// Returns the number of strains above a threshold averaged as the threshold varies.
/// A strain is considered difficult if it's higher than 66% of the highest strain. /// The result is scaled by clock rate as it affects the total number of strains.
/// </summary> /// </summary>
public int CountDifficultStrains(double clockRate) public double CountDifficultStrains(double clockRate)
{ {
List<double> strains = GetCurrentStrainPeaks().OrderByDescending(d => d).ToList(); List<double> strains = GetCurrentStrainPeaks().ToList();
// This is the average value of strains.Count(s => s > p * strains.Max()) for p between 0 and 1.
// Total number of strains in a map can vary by clockrate, and this needs to be corrected for. double realtimeCount = strains.Sum() / strains.Max();
return (int)(strains.Count(s => s > strains[0] * 0.66) * clockRate); return clockRate * realtimeCount;
} }
} }
} }