h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-16 05:12:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #17327 from frenzibyte/simplify-extension-methods

Browse Source 
Simplify `IncreasesCombo`/`BreaksCombo` helper method implementation
This commit is contained in:
Dean Herbert 2022-03-19 20:23:09 +09:00 committed by GitHub
commit 9aa902785c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,30 +125,28 @@ namespace osu.Game.Rulesets.Scoring
/// Whether a <see cref="HitResult"/> increases the combo. /// Whether a <see cref="HitResult"/> increases the combo.
/// </summary> /// </summary>
public static bool IncreasesCombo(this HitResult result) public static bool IncreasesCombo(this HitResult result)
=> AffectsCombo(result) && IsHit(result);
/// <summary>
/// Whether a <see cref="HitResult"/> breaks the combo and resets it back to zero.
/// </summary>
public static bool BreaksCombo(this HitResult result)
=> AffectsCombo(result) && !IsHit(result);
/// <summary>
/// Whether a <see cref="HitResult"/> increases/breaks the combo, and affects the combo portion of the score.
/// </summary>
public static bool AffectsCombo(this HitResult result)
{ {
switch (result) switch (result)
{ {
case HitResult.Miss:
case HitResult.Meh: case HitResult.Meh:
case HitResult.Ok: case HitResult.Ok:
case HitResult.Good: case HitResult.Good:
case HitResult.Great: case HitResult.Great:
case HitResult.Perfect: case HitResult.Perfect:
case HitResult.LargeTickHit: case HitResult.LargeTickHit:
return true;
default:
return false;
}
}
/// <summary>
/// Whether a <see cref="HitResult"/> breaks the combo and resets it back to zero.
/// </summary>
public static bool BreaksCombo(this HitResult result)
{
switch (result)
{
case HitResult.Miss:
case HitResult.LargeTickMiss: case HitResult.LargeTickMiss:
return true; return true;
@ -157,12 +155,6 @@ namespace osu.Game.Rulesets.Scoring
} }
} }
/// <summary>
/// Whether a <see cref="HitResult"/> increases/breaks the combo, and affects the combo portion of the score.
/// </summary>
public static bool AffectsCombo(this HitResult result)
=> IncreasesCombo(result) || BreaksCombo(result);
/// <summary> /// <summary>
/// Whether a <see cref="HitResult"/> affects the accuracy portion of the score. /// Whether a <see cref="HitResult"/> affects the accuracy portion of the score.
/// </summary> /// </summary>