Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase slider tails' worth to 150 points (up from 30) #26248

Merged
merged 3 commits into from
Jan 2, 2024
Merged

Increase slider tails' worth to 150 points (up from 30) #26248

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
807443b
Add HitResult.SliderTailHit
smoogipoo Dec 30, 2023
17a5312
Use SliderTailHit result for slider tails (non-classic-mod)
smoogipoo Dec 30, 2023
9453180
Make slider ends show on results screen again
peppy Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ public void TestHitEarlyMoveIntoFollowRegion()

assertHeadJudgement(HitResult.Meh);
assertTickJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit);
}

4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
View file
Original file line number Diff line number Diff line change
@@ -467,13 +467,13 @@ private void assertAllMaxJudgements()

private void assertHeadMissTailTracked()
{
AddAssert("Tracking retained", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.LargeTickHit));
AddAssert("Tracking retained", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.SliderTailHit));
AddAssert("Slider head missed", () => judgementResults.First().IsHit, () => Is.False);
}

private void assertMidSliderJudgements()
{
AddAssert("Tracking acquired", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.LargeTickHit));
AddAssert("Tracking acquired", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.SliderTailHit));
}

private void assertMidSliderJudgementFail()
14 changes: 7 additions & 7 deletions osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ public void TestHitLateInRangeTracks()
});

assertHeadJudgement(HitResult.Ok);
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit);
}

@@ -103,7 +103,7 @@ public void TestHitLateInRangeHitsTicks()
assertTickJudgement(1, HitResult.LargeTickHit);
assertTickJudgement(2, HitResult.LargeTickHit);
assertTickJudgement(3, HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit);
}

@@ -182,7 +182,7 @@ public void TestHitLateShortSliderHitsAll()
assertHeadJudgement(HitResult.Meh);
assertAllTickJudgements(HitResult.LargeTickHit);
assertRepeatJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit);
}

@@ -210,7 +210,7 @@ public void TestHitLateInRangeHitsRepeat()

assertHeadJudgement(HitResult.Meh);
assertRepeatJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit);
}

@@ -245,7 +245,7 @@ public void TestHitLateDoesNotHitTicksIfAnyOutOfRange()
assertAllTickJudgements(HitResult.LargeTickMiss);

// This particular test actually starts tracking the slider just before the end, so the tail should be hit because of its leniency.
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);

assertSliderJudgement(HitResult.IgnoreHit);
}
@@ -276,7 +276,7 @@ public void TestHitLateInRangeDoesNotHitOutOfRangeTick()

assertHeadJudgement(HitResult.Meh);
assertTickJudgement(0, HitResult.LargeTickMiss);
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit);
}

@@ -307,7 +307,7 @@ public void TestHitLateInRangeDoesNotHitOutOfRangeTickAndTrackingLimitedToBall()
assertHeadJudgement(HitResult.Meh);
assertTickJudgement(0, HitResult.LargeTickMiss);
assertTickJudgement(1, HitResult.LargeTickMiss);
assertTailJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit);
}

2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ public class LegacyTailJudgement : OsuJudgement

public class TailJudgement : SliderEndJudgement
{
public override HitResult MaxResult => HitResult.LargeTickHit;
public override HitResult MaxResult => HitResult.SliderTailHit;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to confirm, this is 100% intended to only affect non-classic mod scores?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this would be the intention. LargeTickHit matches classic scoring closer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think @peppy is misunderstanding. Classic mod is using SmallTickHit, and the reason it is so is because the slider judgment (the proportional one) is the one that applies the combo. Classic mod is still not quite 1:1.

So yes, it is intended that this only affects non-classic-mod scores.

public override HitResult MinResult => HitResult.IgnoreMiss;
}
}
2 changes: 2 additions & 0 deletions osu.Game.Rulesets.Osu/OsuRuleset.cs
View file
Original file line number Diff line number Diff line change
@@ -277,6 +277,7 @@ protected override IEnumerable<HitResult> GetValidHitResults()

HitResult.LargeTickHit,
HitResult.SmallTickHit,
HitResult.SliderTailHit,
HitResult.SmallBonus,
HitResult.LargeBonus,
};
@@ -289,6 +290,7 @@ public override LocalisableString GetDisplayNameForHitResult(HitResult result)
case HitResult.LargeTickHit:
return "slider tick";

case HitResult.SliderTailHit:
case HitResult.SmallTickHit:
return "slider end";

1 change: 1 addition & 0 deletions osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
View file
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@ private double getHealthIncreaseFor(JudgementResult result)
// When classic slider mechanics are enabled, this result comes from the tail.
return 0.02;

case HitResult.SliderTailHit:
case HitResult.LargeTickHit:
switch (result.HitObject)
{
1 change: 1 addition & 0 deletions osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
View file
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ protected override double GetHealthIncreaseFor(HitObject hitObject, HitResult re
increase = 0.02;
break;

case HitResult.SliderTailHit:
case HitResult.LargeTickHit:
// This result comes from either a slider tick or repeat.
increase = hitObject is SliderTick ? 0.015 : 0.02;
8 changes: 8 additions & 0 deletions osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
View file
Original file line number Diff line number Diff line change
@@ -84,6 +84,7 @@ public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int e
[TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 493_652)]
[TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
[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.LargeBonus, HitResult.LargeBonus, 1_000_150)]
[TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
@@ -96,6 +97,7 @@ public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int e
[TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 49_365)]
[TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
[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.LargeBonus, HitResult.LargeBonus, 100_015)]
public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
@@ -167,6 +169,7 @@ public void TestEmptyBeatmap(
[TestCase(HitResult.Perfect, HitResult.Miss)]
[TestCase(HitResult.SmallTickHit, HitResult.SmallTickMiss)]
[TestCase(HitResult.LargeTickHit, HitResult.LargeTickMiss)]
[TestCase(HitResult.SliderTailHit, HitResult.LargeTickMiss)]
[TestCase(HitResult.SmallBonus, HitResult.IgnoreMiss)]
[TestCase(HitResult.LargeBonus, HitResult.IgnoreMiss)]
public void TestMinResults(HitResult hitResult, HitResult expectedMinResult)
@@ -187,6 +190,7 @@ public void TestMinResults(HitResult hitResult, HitResult expectedMinResult)
[TestCase(HitResult.SmallTickHit, false)]
[TestCase(HitResult.LargeTickMiss, true)]
[TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, false)]
[TestCase(HitResult.LargeBonus, false)]
public void TestAffectsCombo(HitResult hitResult, bool expectedReturnValue)
@@ -207,6 +211,7 @@ public void TestAffectsCombo(HitResult hitResult, bool expectedReturnValue)
[TestCase(HitResult.SmallTickHit, true)]
[TestCase(HitResult.LargeTickMiss, true)]
[TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, false)]
[TestCase(HitResult.LargeBonus, false)]
public void TestAffectsAccuracy(HitResult hitResult, bool expectedReturnValue)
@@ -227,6 +232,7 @@ public void TestAffectsAccuracy(HitResult hitResult, bool expectedReturnValue)
[TestCase(HitResult.SmallTickHit, false)]
[TestCase(HitResult.LargeTickMiss, false)]
[TestCase(HitResult.LargeTickHit, false)]
[TestCase(HitResult.SliderTailHit, false)]
[TestCase(HitResult.SmallBonus, true)]
[TestCase(HitResult.LargeBonus, true)]
public void TestIsBonus(HitResult hitResult, bool expectedReturnValue)
@@ -247,6 +253,7 @@ public void TestIsBonus(HitResult hitResult, bool expectedReturnValue)
[TestCase(HitResult.SmallTickHit, true)]
[TestCase(HitResult.LargeTickMiss, false)]
[TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, true)]
[TestCase(HitResult.LargeBonus, true)]
public void TestIsHit(HitResult hitResult, bool expectedReturnValue)
@@ -267,6 +274,7 @@ public void TestIsHit(HitResult hitResult, bool expectedReturnValue)
[TestCase(HitResult.SmallTickHit, true)]
[TestCase(HitResult.LargeTickMiss, true)]
[TestCase(HitResult.LargeTickHit, true)]
[TestCase(HitResult.SliderTailHit, true)]
[TestCase(HitResult.SmallBonus, true)]
[TestCase(HitResult.LargeBonus, true)]
public void TestIsScorable(HitResult hitResult, bool expectedReturnValue)
2 changes: 2 additions & 0 deletions osu.Game/Rulesets/Judgements/Judgement.cs
View file
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ public virtual HitResult MinResult
return HitResult.SmallTickMiss;

case HitResult.LargeTickHit:
case HitResult.SliderTailHit:
return HitResult.LargeTickMiss;

default:
@@ -104,6 +105,7 @@ protected virtual double HealthIncreaseFor(HitResult result)
case HitResult.SmallTickMiss:
return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;

case HitResult.SliderTailHit:
case HitResult.LargeTickHit:
return DEFAULT_MAX_HEALTH_INCREASE;

15 changes: 15 additions & 0 deletions osu.Game/Rulesets/Scoring/HitResult.cs
View file
Original file line number Diff line number Diff line change
@@ -139,6 +139,13 @@ public enum HitResult
[Order(15)]
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>
/// 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 @@ public static bool AffectsCombo(this HitResult result)
case HitResult.LargeTickMiss:
case HitResult.LegacyComboIncrease:
case HitResult.ComboBreak:
case HitResult.SliderTailHit:
return true;

default:
@@ -246,6 +254,7 @@ public static bool IsTick(this HitResult result)
case HitResult.LargeTickMiss:
case HitResult.SmallTickHit:
case HitResult.SmallTickMiss:
case HitResult.SliderTailHit:
return true;

default:
@@ -329,6 +338,9 @@ public static bool IsScorable(this HitResult result)
case HitResult.ComboBreak:
return true;

case HitResult.SliderTailHit:
return true;

default:
// Note that IgnoreHit and IgnoreMiss are excluded as they do not affect score.
return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
@@ -383,6 +395,9 @@ public static void ValidateHitResultPair(HitResult maxResult, HitResult minResul
if (minResult == HitResult.IgnoreMiss)
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)
throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");

3 changes: 3 additions & 0 deletions osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View file
Original file line number Diff line number Diff line change
@@ -322,6 +322,9 @@ public virtual int GetBaseScoreForResult(HitResult result)
case HitResult.LargeTickHit:
return 30;

case HitResult.SliderTailHit:
return 150;

case HitResult.Meh:
return 50;

1 change: 1 addition & 0 deletions osu.Game/Scoring/ScoreInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -350,6 +350,7 @@ public IEnumerable<HitResultDisplayStatistic> GetStatisticsForDisplay()
{
case HitResult.SmallTickHit:
case HitResult.LargeTickHit:
case HitResult.SliderTailHit:
case HitResult.LargeBonus:
case HitResult.SmallBonus:
if (MaximumStatistics.TryGetValue(r.result, out int count) && count > 0)