h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 06:42:56 +08:00
Code Issues Releases Wiki Activity

Split ignore into hit/miss

Browse Source
This commit is contained in:
smoogipoo 2020-09-29 14:41:50 +09:00
parent 4bcc3ca828
commit 1a70002cdd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,9 @@ namespace osu.Game.Rulesets.Scoring
/// Indicates that the object has not been judged yet.
/// </summary>
[Description(@"")]
[Order(13)]
[Order(14)]
None,
[Order(12)]
Ignore,
/// <summary>
/// Indicates that the object has been judged as a miss.
/// </summary>
@ -95,6 +92,12 @@ namespace osu.Game.Rulesets.Scoring
[Description("L Bonus")]
[Order(8)]
LargeBonus,
[Order(13)]
IgnoreMiss,
[Order(12)]
IgnoreHit,
}
public static class HitResultExtensions
@ -151,7 +154,7 @@ namespace osu.Game.Rulesets.Scoring
switch (result)
{
case HitResult.None:
case HitResult.Ignore:
case HitResult.IgnoreMiss:
case HitResult.Miss:
case HitResult.SmallTickMiss:
case HitResult.LargeTickMiss:
@ -165,6 +168,6 @@ namespace osu.Game.Rulesets.Scoring
/// <summary>
/// Whether a <see cref="HitResult"/> is scorable.
/// </summary>
public static bool IsScorable(this HitResult result) => result > HitResult.Ignore;
public static bool IsScorable(this HitResult result) => result >= HitResult.Miss && result < HitResult.IgnoreMiss;
}
}