RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply various inspections

This commit is contained in:
Dean Herbert 2023-11-12 16:20:13 +09:00
parent 4df1eb1b37
commit a04f9aaef7
No known key found for this signature in database
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Catch/CatchRuleset.cs
View File

@ -238,12 +238,12 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
{
BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
double preempt = adjustedDifficulty.ApproachRate < 6 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
preempt /= rate;
adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
return adjustedDifficulty;
}
}
}

6
osu.Game.Rulesets.Osu/OsuRuleset.cs
View File

@ -334,9 +334,7 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
{
BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
double preempt = adjustedDifficulty.ApproachRate < 5 ?
(1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) :
(1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
preempt /= rate;
adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
@ -344,7 +342,7 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
hitwindow /= rate;
adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
return adjustedDifficulty;
}
}
}

2
osu.Game.Rulesets.Taiko/TaikoRuleset.cs
View File

@ -273,7 +273,7 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
hitwindow /= rate;
adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitwindow) / 15 + 5);
return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
return adjustedDifficulty;
}
}
}