h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-23 03:02:55 +08:00
Code Issues Releases Wiki Activity

Use SliderTailHit result for slider tails (non-classic-mod)

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

2
osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Tests
assertHeadJudgement(HitResult.Meh); assertHeadJudgement(HitResult.Meh);
assertTickJudgement(HitResult.LargeTickHit); assertTickJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit); assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit); assertSliderJudgement(HitResult.IgnoreHit);
} }

4
osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
View File

@ -467,13 +467,13 @@ namespace osu.Game.Rulesets.Osu.Tests
private void assertHeadMissTailTracked() 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); AddAssert("Slider head missed", () => judgementResults.First().IsHit, () => Is.False);
} }
private void assertMidSliderJudgements() 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() private void assertMidSliderJudgementFail()

14
osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests
}); });
assertHeadJudgement(HitResult.Ok); assertHeadJudgement(HitResult.Ok);
assertTailJudgement(HitResult.LargeTickHit); assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit); assertSliderJudgement(HitResult.IgnoreHit);
} }
@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Tests
assertTickJudgement(1, HitResult.LargeTickHit); assertTickJudgement(1, HitResult.LargeTickHit);
assertTickJudgement(2, HitResult.LargeTickHit); assertTickJudgement(2, HitResult.LargeTickHit);
assertTickJudgement(3, HitResult.LargeTickHit); assertTickJudgement(3, HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit); assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit); assertSliderJudgement(HitResult.IgnoreHit);
} }
@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Tests
assertHeadJudgement(HitResult.Meh); assertHeadJudgement(HitResult.Meh);
assertAllTickJudgements(HitResult.LargeTickHit); assertAllTickJudgements(HitResult.LargeTickHit);
assertRepeatJudgement(HitResult.LargeTickHit); assertRepeatJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit); assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit); assertSliderJudgement(HitResult.IgnoreHit);
} }
@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Osu.Tests
assertHeadJudgement(HitResult.Meh); assertHeadJudgement(HitResult.Meh);
assertRepeatJudgement(HitResult.LargeTickHit); assertRepeatJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.LargeTickHit); assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit); assertSliderJudgement(HitResult.IgnoreHit);
} }
@ -245,7 +245,7 @@ namespace osu.Game.Rulesets.Osu.Tests
assertAllTickJudgements(HitResult.LargeTickMiss); 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. // 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); assertSliderJudgement(HitResult.IgnoreHit);
} }
@ -276,7 +276,7 @@ namespace osu.Game.Rulesets.Osu.Tests
assertHeadJudgement(HitResult.Meh); assertHeadJudgement(HitResult.Meh);
assertTickJudgement(0, HitResult.LargeTickMiss); assertTickJudgement(0, HitResult.LargeTickMiss);
assertTailJudgement(HitResult.LargeTickHit); assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit); assertSliderJudgement(HitResult.IgnoreHit);
} }
@ -307,7 +307,7 @@ namespace osu.Game.Rulesets.Osu.Tests
assertHeadJudgement(HitResult.Meh); assertHeadJudgement(HitResult.Meh);
assertTickJudgement(0, HitResult.LargeTickMiss); assertTickJudgement(0, HitResult.LargeTickMiss);
assertTickJudgement(1, HitResult.LargeTickMiss); assertTickJudgement(1, HitResult.LargeTickMiss);
assertTailJudgement(HitResult.LargeTickHit); assertTailJudgement(HitResult.SliderTailHit);
assertSliderJudgement(HitResult.IgnoreHit); assertSliderJudgement(HitResult.IgnoreHit);
} }

2
osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects
public class TailJudgement : SliderEndJudgement public class TailJudgement : SliderEndJudgement
{ {
public override HitResult MaxResult => HitResult.LargeTickHit; public override HitResult MaxResult => HitResult.SliderTailHit;
public override HitResult MinResult => HitResult.IgnoreMiss; public override HitResult MinResult => HitResult.IgnoreMiss;
} }
} }

1
osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
View File

@ -91,6 +91,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
// When classic slider mechanics are enabled, this result comes from the tail. // When classic slider mechanics are enabled, this result comes from the tail.
return 0.02; return 0.02;
case HitResult.SliderTailHit:
case HitResult.LargeTickHit: case HitResult.LargeTickHit:
switch (result.HitObject) switch (result.HitObject)
{ {

1
osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
View File

@ -57,6 +57,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
increase = 0.02; increase = 0.02;
break; break;
case HitResult.SliderTailHit:
case HitResult.LargeTickHit: case HitResult.LargeTickHit:
// This result comes from either a slider tick or repeat. // This result comes from either a slider tick or repeat.
increase = hitObject is SliderTick ? 0.015 : 0.02; increase = hitObject is SliderTick ? 0.015 : 0.02;