h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 23:47:25 +08:00
Code Issues Releases Wiki Activity

Remove clockrate factor

Browse Source
This commit is contained in:
apollo-dw 2022-02-19 15:33:28 +00:00
parent 94a46ab640
commit c18df86720
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
double aimDifficultyStrainCount = ((OsuStrainSkill)skills[0]).CountDifficultStrains(clockRate); double aimDifficultyStrainCount = ((OsuStrainSkill)skills[0]).CountDifficultStrains();
double speedDifficultyStrainCount = ((OsuStrainSkill)skills[2]).CountDifficultStrains(clockRate); double speedDifficultyStrainCount = ((OsuStrainSkill)skills[2]).CountDifficultStrains();
if (mods.Any(h => h is OsuModRelax)) if (mods.Any(h => h is OsuModRelax))
speedRating = 0.0; speedRating = 0.0;

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

@ -64,12 +64,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
/// Returns the number of strains weighted against the top strain. /// Returns the number of strains weighted against the top strain.
/// The result is scaled by clock rate as it affects the total number of strains. /// The result is scaled by clock rate as it affects the total number of strains.
/// </summary> /// </summary>
public double CountDifficultStrains(double clockRate) public double CountDifficultStrains()
{ {
double topStrain = objectStrains.Max(); double topStrain = objectStrains.Max();
double realtimeCount = objectStrains.Sum(s => Math.Pow(s / topStrain, 4)); return objectStrains.Sum(s => Math.Pow(s / topStrain, 4));
return clockRate * realtimeCount;
} }
} }
} }