h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 22:07:25 +08:00
Code Issues Releases Wiki Activity

merged latest from origin

Browse Source
This commit is contained in:
Xexxar 2021-08-21 17:25:06 +00:00
commit 536aef6f2f
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
View File

@ -15,13 +15,13 @@ namespace osu.Game.Rulesets.Osu.Tests
{
protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
[TestCase(6.7568168283591499d, "diffcalc-test")]
[TestCase(1.0348244046058293d, "zero-length-sliders")]
[TestCase(6.6915334809485199d, "diffcalc-test")]
[TestCase(1.0366129190339499d, "zero-length-sliders")]
public void Test(double expected, string name)
=> base.Test(expected, name);
[TestCase(8.4783236764532557d, "diffcalc-test")]
[TestCase(1.2708532136987165d, "zero-length-sliders")]
[TestCase(8.3966904501824473d, "diffcalc-test")]
[TestCase(1.2732783892964523d, "zero-length-sliders")]
public void TestClockRateAdjusted(double expected, string name)
=> Test(expected, name, new OsuModDoubleTime());

3
osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
View File

@ -197,8 +197,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
pm * Math.Pow(229.5 - 11 * Attributes.OverallDifficulty, 2.0);
double accuracyValue = 2.83 * Math.Pow(1.52163, (79.5 - 2 * Math.Sqrt(variance)) / 6.0)
* Math.Pow(Math.Log(1.0 + (Math.E - 1.0) * (Math.Min(amountHitObjectsWithAccuracy, 1600) / 1000.0)), 0.5);
* Math.Pow(Math.Log(1.0 + (Math.E - 1.0) * (Math.Min(amountHitObjectsWithAccuracy, 1600) / 1000.0)), 0.5);
if (mods.Any(m => m is OsuModHidden))
accuracyValue *= 1.08;

2
osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
View File

@ -88,7 +88,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
{
islandSize++; // island is still progressing, count size.
}
else
{
if (islandSize > 6)
@ -158,7 +157,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
angleBonus = 1.25;
else if (angle < angle_bonus_begin)
angleBonus = 1 + Math.Pow(Math.Sin(1.5 * (angle_bonus_begin - angle)), 2) / 4;
}
return (angleBonus * speedBonus * Math.Pow(distance / single_spacing_threshold, 3.5)) / osuCurrObj.StrainTime;