h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:43:04 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into user-class-cleanup

Browse Source
This commit is contained in:
Dean Herbert 2021-11-08 12:52:28 +09:00 committed by GitHub
commit 61b318fabf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,12 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
[TestCase(6.6975550434910005d, "diffcalc-test")]
[TestCase(1.4673500058356748d, "zero-length-sliders")]
[TestCase(1.4670676815251105d, "zero-length-sliders")]
public void Test(double expected, string name)
=> base.Test(expected, name);
[TestCase(8.938989502378238d, "diffcalc-test")]
[TestCase(1.779323508403831d, "zero-length-sliders")]
[TestCase(8.9389769779826267d, "diffcalc-test")]
[TestCase(1.7786917985891204d, "zero-length-sliders")]
public void TestClockRateAdjusted(double expected, string name)
=> Test(expected, name, new OsuModDoubleTime());

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

@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private const double slider_multiplier = 1.5;
private const double velocity_change_multiplier = 0.75;
private double currentStrain = 1;
private double currentStrain;
private double skillMultiplier => 23.25;
private double strainDecayBase => 0.15;

3
osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
View File

@ -23,7 +23,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private double strainDecayBase => 0.15;
protected override double DecayWeight => 1.0;
protected override int HistoryLength => 10; // Look back for 10 notes is added for the sake of flashlight calculations.
private double currentStrain = 1;
private double currentStrain;
private double strainValueOf(DifficultyHitObject current)
{

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

@ -24,8 +24,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private double skillMultiplier => 1375;
private double strainDecayBase => 0.3;
private double currentStrain = 1;
private double currentRhythm = 1;
private double currentStrain;
private double currentRhythm;
protected override int ReducedSectionCount => 5;
protected override double DifficultyMultiplier => 1.04;