RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-28 00:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update HitResult helpers with new judgement

Browse Source
This commit is contained in:
Dan Balasescu 2023-10-09 11:50:17 +09:00
parent f0da7f016d
commit 326702165f
No known key found for this signature in database
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,7 @@ namespace osu.Game.Rulesets.Scoring
case HitResult.LargeTickHit: case HitResult.LargeTickHit:
case HitResult.LargeTickMiss: case HitResult.LargeTickMiss:
case HitResult.LegacyComboIncrease: case HitResult.LegacyComboIncrease:
case HitResult.ComboBreak:
return true; return true;
default: default:
@ -187,11 +188,19 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
public static bool AffectsAccuracy(this HitResult result) public static bool AffectsAccuracy(this HitResult result)
{ {
// LegacyComboIncrease is a special type which is neither a basic, tick, bonus, or accuracy-affecting result. switch (result)
if (result == HitResult.LegacyComboIncrease) {
return false; // LegacyComboIncrease is a special non-gameplay type which is neither a basic, tick, bonus, or accuracy-affecting result.
case HitResult.LegacyComboIncrease:
return false;
return IsScorable(result) && !IsBonus(result); // ComboBreak is a special type that only affects combo. It cannot be considered as basic, tick, bonus, or accuracy-affecting.
case HitResult.ComboBreak:
return false;
default:
return IsScorable(result) && !IsBonus(result);
}
} }
/// <summary> /// <summary>
@ -199,11 +208,19 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
public static bool IsBasic(this HitResult result) public static bool IsBasic(this HitResult result)
{ {
// LegacyComboIncrease is a special type which is neither a basic, tick, bonus, or accuracy-affecting result. switch (result)
if (result == HitResult.LegacyComboIncrease) {
return false; // LegacyComboIncrease is a special non-gameplay type which is neither a basic, tick, bonus, or accuracy-affecting result.
case HitResult.LegacyComboIncrease:
return false;
return IsScorable(result) && !IsTick(result) && !IsBonus(result); // ComboBreak is a special type that only affects combo. It cannot be considered as basic, tick, bonus, or accuracy-affecting.
case HitResult.ComboBreak:
return false;
default:
return IsScorable(result) && !IsTick(result) && !IsBonus(result);
}
} }
/// <summary> /// <summary>
@ -252,6 +269,7 @@ namespace osu.Game.Rulesets.Scoring
case HitResult.Miss: case HitResult.Miss:
case HitResult.SmallTickMiss: case HitResult.SmallTickMiss:
case HitResult.LargeTickMiss: case HitResult.LargeTickMiss:
case HitResult.ComboBreak:
return false; return false;
default: default:
@ -264,11 +282,20 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
public static bool IsScorable(this HitResult result) public static bool IsScorable(this HitResult result)
{ {
// LegacyComboIncrease is not actually scorable (in terms of usable by rulesets for that purpose), but needs to be defined as such to be correctly included in statistics output. switch (result)
if (result == HitResult.LegacyComboIncrease) {
return true; // LegacyComboIncrease is not actually scorable (in terms of usable by rulesets for that purpose), but needs to be defined as such to be correctly included in statistics output.
case HitResult.LegacyComboIncrease:
return true;
return result >= HitResult.Miss && result < HitResult.IgnoreMiss; // ComboBreak is its own type that affects score via combo.
case HitResult.ComboBreak:
return true;
default:
// Note that IgnoreHit and IgnoreMiss are excluded as they do not affect score.
return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
}
} }
/// <summary> /// <summary>