h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-07 20:12:54 +08:00
Code Issues Releases Wiki Activity

Return null instead of infinity

Browse Source
This commit is contained in:
Natelytle 2022-10-28 16:18:17 -04:00
parent 2940d18d33
commit 883790c7a7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceAttributes.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
public double EffectiveMissCount { get; set; } public double EffectiveMissCount { get; set; }
[JsonProperty("estimated_ur")] [JsonProperty("estimated_ur")]
public double EstimatedUR { get; set; } public double? EstimatedUR { get; set; }
public override IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay() public override IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
{ {

15
osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
private int countOk; private int countOk;
private int countMeh; private int countMeh;
private int countMiss; private int countMiss;
private double estimatedDeviation; private double? estimatedDeviation;
private double effectiveMissCount; private double effectiveMissCount;
@ -91,15 +91,18 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
if (score.Mods.Any(m => m is ModFlashlight<TaikoHitObject>)) if (score.Mods.Any(m => m is ModFlashlight<TaikoHitObject>))
difficultyValue *= 1.050 * lengthBonus; difficultyValue *= 1.050 * lengthBonus;
return difficultyValue * Math.Pow(SpecialFunctions.Erf(40 / (Math.Sqrt(2) * estimatedDeviation)), 2.0); if (estimatedDeviation == null)
return 0;
return difficultyValue * Math.Pow(SpecialFunctions.Erf(40 / (Math.Sqrt(2) * (double)estimatedDeviation)), 2.0);
} }
private double computeAccuracyValue(ScoreInfo score, TaikoDifficultyAttributes attributes) private double computeAccuracyValue(ScoreInfo score, TaikoDifficultyAttributes attributes)
{ {
if (attributes.GreatHitWindow <= 0) if (attributes.GreatHitWindow <= 0 || estimatedDeviation == null)
return 0; return 0;
double accuracyValue = Math.Pow(7.5 / estimatedDeviation, 1.1) * Math.Pow(attributes.StarRating, 0.4) * 100.0; double accuracyValue = Math.Pow(7.5 / (double)estimatedDeviation, 1.1) * Math.Pow(attributes.StarRating, 0.4) * 100.0;
double lengthBonus = Math.Min(1.15, Math.Pow(totalHits / 1500.0, 0.3)); double lengthBonus = Math.Min(1.15, Math.Pow(totalHits / 1500.0, 0.3));
@ -110,10 +113,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
return accuracyValue; return accuracyValue;
} }
private double computeEstimatedDeviation(ScoreInfo score, TaikoDifficultyAttributes attributes) private double? computeEstimatedDeviation(ScoreInfo score, TaikoDifficultyAttributes attributes)
{ {
if (totalHits == 0) if (totalHits == 0)
return double.PositiveInfinity; return null;
double greatProbability = 1 - (countOk + countMiss + 1.0) / (totalHits + 1.0); double greatProbability = 1 - (countOk + countMiss + 1.0) / (totalHits + 1.0);