Skip to content

Commit 5fdf637

Browse files
winnerspiroswinnerspiros
authored
Merge pull request #340 from winnerspiros/copilot/merge-ppy-fork-into-ours
Merge ppy/osu upstream (9 commits)
2 parents 63fc2e8 + 24c446f commit 5fdf637

25 files changed

Lines changed: 1197 additions & 12 deletions

File tree

‎osu.Game.Benchmarks/BenchmarkScoreMultiplierCalculator.cs‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2+
// See the LICENCE file in the repository root for full licence text.
3+
4+
using System.Collections.Generic;
5+
using BenchmarkDotNet.Attributes;
6+
using NUnit.Framework;
7+
using osu.Game.Rulesets.Mods;
8+
using osu.Game.Rulesets.Osu;
9+
using osu.Game.Rulesets.Osu.Mods;
10+
using osu.Game.Rulesets.Scoring;
11+
12+
namespace osu.Game.Benchmarks
13+
{
14+
public class BenchmarkScoreMultiplierCalculator : BenchmarkTest
15+
{
16+
private ScoreMultiplierCalculator calculator = null!;
17+
18+
[Params(1, 10, 100)]
19+
public int Times { get; set; }
20+
21+
public record ModTestCase(string Description, IEnumerable<Mod> Mods)
22+
{
23+
public override string ToString() => Description;
24+
}
25+
26+
public static IEnumerable<ModTestCase> ValuesForMods =>
27+
[
28+
new ModTestCase("no mods", []),
29+
new ModTestCase("single mod", [new OsuModHardRock()]),
30+
new ModTestCase("single mod 2", [new OsuModEasy()]),
31+
new ModTestCase("multiple mods", [new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime()]),
32+
new ModTestCase("mods with adjusted settings", [
33+
new OsuModDoubleTime { SpeedChange = { Value = 2 } },
34+
new OsuModHidden { OnlyFadeApproachCircles = { Value = true } },
35+
new OsuModHardRock()
36+
]),
37+
];
38+
39+
[ParamsSource(nameof(ValuesForMods))]
40+
public ModTestCase Mods { get; set; } = null!;
41+
42+
public override void SetUp()
43+
{
44+
base.SetUp();
45+
calculator = new OsuRuleset().CreateScoreMultiplierCalculator();
46+
}
47+
48+
[Benchmark]
49+
public double ViaModScoreMultiplier() => viaModScoreMultiplier(Times, Mods);
50+
51+
[Test]
52+
public void ViaModScoreMultiplier([Values(100)] int times, [ValueSource(nameof(ValuesForMods))] ModTestCase mods)
53+
=> viaModScoreMultiplier(times, mods);
54+
55+
private double viaModScoreMultiplier(int times, ModTestCase mods)
56+
{
57+
double scoreMultiplier = 1;
58+
59+
for (int i = 0; i < times; ++i)
60+
{
61+
scoreMultiplier = 1;
62+
63+
foreach (var mod in mods.Mods)
64+
scoreMultiplier *= mod.ScoreMultiplier;
65+
}
66+
67+
return scoreMultiplier;
68+
}
69+
70+
[Benchmark]
71+
public double ViaCalculator()
72+
=> viaCalculator(Times, Mods);
73+
74+
[Test]
75+
public void ViaCalculator([Values(100)] int times, [ValueSource(nameof(ValuesForMods))] ModTestCase mods)
76+
=> viaCalculator(times, mods);
77+
78+
private double viaCalculator(int times, ModTestCase mods)
79+
{
80+
double scoreMultiplier = 1;
81+
82+
for (int i = 0; i < times; ++i)
83+
scoreMultiplier = calculator.CalculateFor(mods.Mods);
84+
85+
return scoreMultiplier;
86+
}
87+
}
88+
}

‎osu.Game.Rulesets.Catch.Tests/CatchScoreMultiplierTest.cs‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2+
// See the LICENCE file in the repository root for full licence text.
3+
4+
using NUnit.Framework;
5+
using osu.Game.Rulesets.Catch.Mods;
6+
using osu.Game.Tests.Rulesets;
7+
8+
namespace osu.Game.Rulesets.Catch.Tests
9+
{
10+
public class CatchScoreMultiplierTest : RulesetScoreMultiplierTest
11+
{
12+
public CatchScoreMultiplierTest()
13+
: base(new CatchRuleset())
14+
{
15+
}
16+
17+
[Test]
18+
public void TestFlashlightOnNonDefaultSettings()
19+
=> TestModCombination([new CatchModFlashlight { ComboBasedSize = { Value = false } }]);
20+
21+
[Test]
22+
public void TestHalfTimeSpeeds([Values(0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 0.99)] double speedChange)
23+
=> TestModCombination([new CatchModHalfTime { SpeedChange = { Value = speedChange } }]);
24+
25+
[Test]
26+
public void TestDaycoreSpeeds([Values(0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 0.99)] double speedChange)
27+
=> TestModCombination([new CatchModDaycore { SpeedChange = { Value = speedChange } }]);
28+
29+
[Test]
30+
public void TestDoubleTimeSpeeds([Values(1.01, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2)] double speedChange)
31+
=> TestModCombination([new CatchModDoubleTime { SpeedChange = { Value = speedChange } }]);
32+
33+
[Test]
34+
public void TestNightcoreSpeeds([Values(1.01, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2)] double speedChange)
35+
=> TestModCombination([new CatchModNightcore { SpeedChange = { Value = speedChange } }]);
36+
37+
[Test]
38+
public void TestMultiplicativeCombination()
39+
=> TestModCombination([new CatchModHidden(), new CatchModHardRock()]);
40+
}
41+
}

‎osu.Game.Rulesets.Catch/CatchRuleset.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
168168
}
169169
}
170170

171+
public override ScoreMultiplierCalculator CreateScoreMultiplierCalculator() => new CatchScoreMultiplierCalculator();
172+
171173
public override string Description => "osu!catch";
172174

173175
public override string ShortName => SHORT_NAME;

‎osu.Game.Rulesets.Catch/Scoring/CatchScoreMultiplierCalculator.cs‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2+
// See the LICENCE file in the repository root for full licence text.
3+
4+
using osu.Game.Rulesets.Catch.Mods;
5+
using osu.Game.Rulesets.Mods;
6+
using osu.Game.Rulesets.Scoring;
7+
8+
namespace osu.Game.Rulesets.Catch.Scoring
9+
{
10+
public class CatchScoreMultiplierCalculator : ScoreMultiplierCalculator
11+
{
12+
static CatchScoreMultiplierCalculator()
13+
{
14+
#region Difficulty Reduction
15+
16+
Single<CatchModEasy>(hasMultiplier: 0.5);
17+
Single<CatchModNoFail>(hasMultiplier: 0.5);
18+
Single<CatchModHalfTime>(hasMultiplier: halfTime => rateAdjustMultiplier(halfTime.SpeedChange.Value));
19+
Single<CatchModDaycore>(hasMultiplier: daycore => rateAdjustMultiplier(daycore.SpeedChange.Value));
20+
21+
#endregion
22+
23+
#region Difficulty Increase
24+
25+
Single<CatchModHardRock>(hasMultiplier: hardRock => hardRock.UsesDefaultConfiguration ? 1.12 : 1);
26+
// Sudden Death
27+
// Perfect
28+
Single<CatchModDoubleTime>(hasMultiplier: doubleTime => rateAdjustMultiplier(doubleTime.SpeedChange.Value));
29+
Single<CatchModNightcore>(hasMultiplier: nightcore => rateAdjustMultiplier(nightcore.SpeedChange.Value));
30+
Single<CatchModHidden>(hasMultiplier: hidden => hidden.UsesDefaultConfiguration ? 1.06 : 1);
31+
Single<CatchModFlashlight>(hasMultiplier: flashlight => flashlight.UsesDefaultConfiguration ? 1.12 : 1);
32+
// Accuracy Challenge
33+
34+
#endregion
35+
36+
#region Conversion
37+
38+
Single<CatchModDifficultyAdjust>(hasMultiplier: 0.5);
39+
Single<CatchModClassic>(hasMultiplier: 0.96);
40+
// Mirror
41+
42+
#endregion
43+
44+
#region Automation
45+
46+
// Autoplay
47+
// Cinema
48+
Single<CatchModRelax>(hasMultiplier: 0.1);
49+
50+
#endregion
51+
52+
#region Fun
53+
54+
Single<ModWindUp>(hasMultiplier: 0.5);
55+
Single<ModWindDown>(hasMultiplier: 0.5);
56+
// Floating Fruits
57+
// Muted
58+
// No Scope
59+
// Moving Fast
60+
Single<CatchModSynesthesia>(hasMultiplier: 0.8);
61+
62+
#endregion
63+
64+
#region System
65+
66+
// Score V2
67+
68+
#endregion
69+
}
70+
71+
private static double rateAdjustMultiplier(double speedChange)
72+
{
73+
// Round to the nearest multiple of 0.1.
74+
double value = (int)(speedChange * 10) / 10.0;
75+
76+
// Offset back to 0.
77+
value -= 1;
78+
79+
if (speedChange >= 1)
80+
return 1 + value / 5;
81+
else
82+
return 0.6 + value;
83+
}
84+
}
85+
}

‎osu.Game.Rulesets.Mania.Tests/ManiaScoreMultiplierTest.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2+
// See the LICENCE file in the repository root for full licence text.
3+
4+
using NUnit.Framework;
5+
using osu.Game.Rulesets.Mania.Mods;
6+
using osu.Game.Tests.Rulesets;
7+
8+
namespace osu.Game.Rulesets.Mania.Tests
9+
{
10+
public class ManiaScoreMultiplierTest : RulesetScoreMultiplierTest
11+
{
12+
public ManiaScoreMultiplierTest()
13+
: base(new ManiaRuleset())
14+
{
15+
}
16+
17+
[Test]
18+
public void TestHalfTimeSpeeds([Values(0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 0.99)] double speedChange)
19+
=> TestModCombination([new ManiaModHalfTime { SpeedChange = { Value = speedChange } }]);
20+
21+
[Test]
22+
public void TestDaycoreSpeeds([Values(0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 0.99)] double speedChange)
23+
=> TestModCombination([new ManiaModDaycore { SpeedChange = { Value = speedChange } }]);
24+
25+
[Test]
26+
public void TestDoubleTimeSpeeds([Values(1.01, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2)] double speedChange)
27+
=> TestModCombination([new ManiaModDoubleTime { SpeedChange = { Value = speedChange } }]);
28+
29+
[Test]
30+
public void TestNightcoreSpeeds([Values(1.01, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.55, 1.6, 1.65, 1.7, 1.75, 1.8, 1.85, 1.9, 1.95, 2)] double speedChange)
31+
=> TestModCombination([new ManiaModNightcore { SpeedChange = { Value = speedChange } }]);
32+
33+
[Test]
34+
public void TestMultiplicativeCombination()
35+
=> TestModCombination([new ManiaModEasy(), new ManiaModKey4()]);
36+
}
37+
}

‎osu.Game.Rulesets.Mania/ManiaRuleset.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
307307
}
308308
}
309309

310+
public override ScoreMultiplierCalculator CreateScoreMultiplierCalculator() => new ManiaScoreMultiplierCalculator();
311+
310312
public override string Description => "osu!mania";
311313

312314
public override string ShortName => SHORT_NAME;

‎osu.Game.Rulesets.Mania/Scoring/ManiaScoreMultiplierCalculator.cs‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2+
// See the LICENCE file in the repository root for full licence text.
3+
4+
using osu.Game.Rulesets.Mania.Mods;
5+
using osu.Game.Rulesets.Mods;
6+
using osu.Game.Rulesets.Scoring;
7+
8+
namespace osu.Game.Rulesets.Mania.Scoring
9+
{
10+
public class ManiaScoreMultiplierCalculator : ScoreMultiplierCalculator
11+
{
12+
static ManiaScoreMultiplierCalculator()
13+
{
14+
#region Difficulty Reduction
15+
16+
Single<ManiaModEasy>(hasMultiplier: 0.5);
17+
Single<ManiaModNoFail>(hasMultiplier: 0.5);
18+
Single<ManiaModHalfTime>(hasMultiplier: halfTime => rateAdjustMultiplier(halfTime.SpeedChange.Value));
19+
Single<ManiaModDaycore>(hasMultiplier: daycore => rateAdjustMultiplier(daycore.SpeedChange.Value));
20+
Single<ManiaModNoRelease>(hasMultiplier: 0.9);
21+
22+
#endregion
23+
24+
#region Difficulty Increase
25+
26+
// Hard Rock
27+
// Sudden Death
28+
// Perfect
29+
// Double Time
30+
// Nightcore
31+
// Fade In
32+
// Hidden
33+
// Cover
34+
// Flashlight
35+
// Accuracy Challenge
36+
37+
#endregion
38+
39+
#region Conversion
40+
41+
// Random
42+
// Dual Stages
43+
// Mirror
44+
Single<ManiaModDifficultyAdjust>(hasMultiplier: 0.5);
45+
Single<ManiaModClassic>(hasMultiplier: 0.96);
46+
// Invert
47+
Single<ManiaModConstantSpeed>(hasMultiplier: 0.9);
48+
Single<ManiaModHoldOff>(hasMultiplier: 0.9);
49+
Single<ManiaModKey1>(hasMultiplier: 0.9);
50+
Single<ManiaModKey2>(hasMultiplier: 0.9);
51+
Single<ManiaModKey3>(hasMultiplier: 0.9);
52+
Single<ManiaModKey4>(hasMultiplier: 0.9);
53+
Single<ManiaModKey5>(hasMultiplier: 0.9);
54+
Single<ManiaModKey6>(hasMultiplier: 0.9);
55+
Single<ManiaModKey7>(hasMultiplier: 0.9);
56+
Single<ManiaModKey8>(hasMultiplier: 0.9);
57+
Single<ManiaModKey9>(hasMultiplier: 0.9);
58+
Single<ManiaModKey10>(hasMultiplier: 0.9);
59+
60+
#endregion
61+
62+
#region Automation
63+
64+
// Autoplay
65+
// Cinema
66+
67+
#endregion
68+
69+
#region Fun
70+
71+
Single<ModWindUp>(hasMultiplier: 0.5);
72+
Single<ModWindDown>(hasMultiplier: 0.5);
73+
// Muted
74+
Single<ModAdaptiveSpeed>(hasMultiplier: 0.5);
75+
76+
#endregion
77+
78+
#region System
79+
80+
// Score V2
81+
82+
#endregion
83+
}
84+
85+
private static double rateAdjustMultiplier(double speedChange)
86+
{
87+
// Round to the nearest multiple of 0.1.
88+
double value = (int)(speedChange * 10) / 10.0;
89+
90+
// Offset back to 0.
91+
value -= 1;
92+
93+
if (speedChange >= 1)
94+
return 1 + value / 5;
95+
else
96+
return 0.6 + value;
97+
}
98+
}
99+
}

0 commit comments

Comments
 (0)