h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 17:27:48 +08:00
Code Issues Releases Wiki Activity

Add HitResult.SliderTailHit

Browse Source
This commit is contained in:
Dan Balasescu 2023-12-30 10:21:59 +09:00
parent 0fa4cd5dfe
commit 807443b648
No known key found for this signature in database
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
View File

@ -84,6 +84,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 493_652)] [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 493_652)]
[TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
[TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 326_963)] [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 326_963)]
[TestCase(ScoringMode.Standardised, HitResult.SliderTailHit, HitResult.SliderTailHit, 326_963)]
[TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)]
[TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)]
[TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
@ -96,6 +97,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 49_365)] [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 49_365)]
[TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
[TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 32_696)] [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 32_696)]
[TestCase(ScoringMode.Classic, HitResult.SliderTailHit, HitResult.SliderTailHit, 32_696)]
[TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 100_003)] [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 100_003)]
[TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 100_015)] [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 100_015)]
public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore) public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
@ -167,6 +169,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(HitResult.Perfect, HitResult.Miss)] [TestCase(HitResult.Perfect, HitResult.Miss)]
[TestCase(HitResult.SmallTickHit, HitResult.SmallTickMiss)] [TestCase(HitResult.SmallTickHit, HitResult.SmallTickMiss)]
[TestCase(HitResult.LargeTickHit, HitResult.LargeTickMiss)] [TestCase(HitResult.LargeTickHit, HitResult.LargeTickMiss)]
[TestCase(HitResult.SliderTailHit, HitResult.LargeTickMiss)]
[TestCase(HitResult.SmallBonus, HitResult.IgnoreMiss)] [TestCase(HitResult.SmallBonus, HitResult.IgnoreMiss)]
[TestCase(HitResult.LargeBonus, HitResult.IgnoreMiss)] [TestCase(HitResult.LargeBonus, HitResult.IgnoreMiss)]
public void TestMinResults(HitResult hitResult, HitResult expectedMinResult) public void TestMinResults(HitResult hitResult, HitResult expectedMinResult)
@ -187,6 +190,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(HitResult.SmallTickHit, false)] [TestCase(HitResult.SmallTickHit, false)]
[TestCase(HitResult.LargeTickMiss, true)] [TestCase(HitResult.LargeTickMiss, true)]
[TestCase(HitResult.LargeTickHit, true)] [TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, false)] [TestCase(HitResult.SmallBonus, false)]
[TestCase(HitResult.LargeBonus, false)] [TestCase(HitResult.LargeBonus, false)]
public void TestAffectsCombo(HitResult hitResult, bool expectedReturnValue) public void TestAffectsCombo(HitResult hitResult, bool expectedReturnValue)
@ -207,6 +211,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(HitResult.SmallTickHit, true)] [TestCase(HitResult.SmallTickHit, true)]
[TestCase(HitResult.LargeTickMiss, true)] [TestCase(HitResult.LargeTickMiss, true)]
[TestCase(HitResult.LargeTickHit, true)] [TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, false)] [TestCase(HitResult.SmallBonus, false)]
[TestCase(HitResult.LargeBonus, false)] [TestCase(HitResult.LargeBonus, false)]
public void TestAffectsAccuracy(HitResult hitResult, bool expectedReturnValue) public void TestAffectsAccuracy(HitResult hitResult, bool expectedReturnValue)
@ -227,6 +232,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(HitResult.SmallTickHit, false)] [TestCase(HitResult.SmallTickHit, false)]
[TestCase(HitResult.LargeTickMiss, false)] [TestCase(HitResult.LargeTickMiss, false)]
[TestCase(HitResult.LargeTickHit, false)] [TestCase(HitResult.LargeTickHit, false)]
[TestCase(HitResult.SliderTailHit, false)]
[TestCase(HitResult.SmallBonus, true)] [TestCase(HitResult.SmallBonus, true)]
[TestCase(HitResult.LargeBonus, true)] [TestCase(HitResult.LargeBonus, true)]
public void TestIsBonus(HitResult hitResult, bool expectedReturnValue) public void TestIsBonus(HitResult hitResult, bool expectedReturnValue)
@ -247,6 +253,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(HitResult.SmallTickHit, true)] [TestCase(HitResult.SmallTickHit, true)]
[TestCase(HitResult.LargeTickMiss, false)] [TestCase(HitResult.LargeTickMiss, false)]
[TestCase(HitResult.LargeTickHit, true)] [TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, true)] [TestCase(HitResult.SmallBonus, true)]
[TestCase(HitResult.LargeBonus, true)] [TestCase(HitResult.LargeBonus, true)]
public void TestIsHit(HitResult hitResult, bool expectedReturnValue) public void TestIsHit(HitResult hitResult, bool expectedReturnValue)
@ -267,6 +274,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
[TestCase(HitResult.SmallTickHit, true)] [TestCase(HitResult.SmallTickHit, true)]
[TestCase(HitResult.LargeTickMiss, true)] [TestCase(HitResult.LargeTickMiss, true)]
[TestCase(HitResult.LargeTickHit, true)] [TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, true)] [TestCase(HitResult.SmallBonus, true)]
[TestCase(HitResult.LargeBonus, true)] [TestCase(HitResult.LargeBonus, true)]
public void TestIsScorable(HitResult hitResult, bool expectedReturnValue) public void TestIsScorable(HitResult hitResult, bool expectedReturnValue)

2
osu.Game/Rulesets/Judgements/Judgement.cs
View File

@ -73,6 +73,7 @@ namespace osu.Game.Rulesets.Judgements
return HitResult.SmallTickMiss; return HitResult.SmallTickMiss;
case HitResult.LargeTickHit: case HitResult.LargeTickHit:
case HitResult.SliderTailHit:
return HitResult.LargeTickMiss; return HitResult.LargeTickMiss;
default: default:
@ -104,6 +105,7 @@ namespace osu.Game.Rulesets.Judgements
case HitResult.SmallTickMiss: case HitResult.SmallTickMiss:
return -DEFAULT_MAX_HEALTH_INCREASE * 0.5; return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
case HitResult.SliderTailHit:
case HitResult.LargeTickHit: case HitResult.LargeTickHit:
return DEFAULT_MAX_HEALTH_INCREASE; return DEFAULT_MAX_HEALTH_INCREASE;

15
osu.Game/Rulesets/Scoring/HitResult.cs
View File

@ -139,6 +139,13 @@ namespace osu.Game.Rulesets.Scoring
[Order(15)] [Order(15)]
ComboBreak, ComboBreak,
/// <summary>
/// A special judgement similar to <see cref="LargeTickHit"/> that's used to increase the valuation of the final tick of a slider.
/// </summary>
[EnumMember(Value = "slider_tail_hit")]
[Order(16)]
SliderTailHit,
/// <summary> /// <summary>
/// A special result used as a padding value for legacy rulesets. It is a hit type and affects combo, but does not affect the base score (does not affect accuracy). /// A special result used as a padding value for legacy rulesets. It is a hit type and affects combo, but does not affect the base score (does not affect accuracy).
/// ///
@ -188,6 +195,7 @@ namespace osu.Game.Rulesets.Scoring
case HitResult.LargeTickMiss: case HitResult.LargeTickMiss:
case HitResult.LegacyComboIncrease: case HitResult.LegacyComboIncrease:
case HitResult.ComboBreak: case HitResult.ComboBreak:
case HitResult.SliderTailHit:
return true; return true;
default: default:
@ -246,6 +254,7 @@ namespace osu.Game.Rulesets.Scoring
case HitResult.LargeTickMiss: case HitResult.LargeTickMiss:
case HitResult.SmallTickHit: case HitResult.SmallTickHit:
case HitResult.SmallTickMiss: case HitResult.SmallTickMiss:
case HitResult.SliderTailHit:
return true; return true;
default: default:
@ -329,6 +338,9 @@ namespace osu.Game.Rulesets.Scoring
case HitResult.ComboBreak: case HitResult.ComboBreak:
return true; return true;
case HitResult.SliderTailHit:
return true;
default: default:
// Note that IgnoreHit and IgnoreMiss are excluded as they do not affect score. // Note that IgnoreHit and IgnoreMiss are excluded as they do not affect score.
return result >= HitResult.Miss && result < HitResult.IgnoreMiss; return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
@ -383,6 +395,9 @@ namespace osu.Game.Rulesets.Scoring
if (minResult == HitResult.IgnoreMiss) if (minResult == HitResult.IgnoreMiss)
return; return;
if (maxResult == HitResult.SliderTailHit && minResult != HitResult.LargeTickMiss)
throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");
if (maxResult == HitResult.LargeTickHit && minResult != HitResult.LargeTickMiss) if (maxResult == HitResult.LargeTickHit && minResult != HitResult.LargeTickMiss)
throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement."); throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");

3
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -322,6 +322,9 @@ namespace osu.Game.Rulesets.Scoring
case HitResult.LargeTickHit: case HitResult.LargeTickHit:
return 30; return 30;
case HitResult.SliderTailHit:
return 150;
case HitResult.Meh: case HitResult.Meh:
return 50; return 50;