diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs index f77c64407f..eb8cf137fa 100644 --- a/osu.Game.Rulesets.Catch/CatchRuleset.cs +++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs @@ -181,10 +181,15 @@ namespace osu.Game.Rulesets.Catch return new[] { HitResult.Great, + HitResult.Miss, HitResult.LargeTickHit, + HitResult.LargeTickMiss, HitResult.SmallTickHit, + HitResult.SmallTickMiss, HitResult.LargeBonus, + HitResult.IgnoreHit, + HitResult.IgnoreMiss, }; } diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs index 6762f534de..3fad9d1047 100644 --- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs +++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs @@ -392,9 +392,11 @@ namespace osu.Game.Rulesets.Mania HitResult.Good, HitResult.Ok, HitResult.Meh, + HitResult.Miss, - // HitResult.SmallBonus is used for awarding perfect bonus score but is not included here as - // it would be a bit redundant to show this to the user. + HitResult.IgnoreHit, + HitResult.ComboBreak, + HitResult.IgnoreMiss, }; } diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs index 56442620b9..f0c4e74410 100644 --- a/osu.Game.Rulesets.Osu/OsuRuleset.cs +++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs @@ -284,12 +284,17 @@ namespace osu.Game.Rulesets.Osu HitResult.Great, HitResult.Ok, HitResult.Meh, + HitResult.Miss, HitResult.LargeTickHit, + HitResult.LargeTickMiss, HitResult.SmallTickHit, + HitResult.SmallTickMiss, HitResult.SliderTailHit, HitResult.SmallBonus, HitResult.LargeBonus, + HitResult.IgnoreHit, + HitResult.IgnoreMiss, }; } diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs index 02cee1f5a6..686d40ff37 100644 --- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs +++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs @@ -228,9 +228,12 @@ namespace osu.Game.Rulesets.Taiko { HitResult.Great, HitResult.Ok, + HitResult.Miss, HitResult.SmallBonus, HitResult.LargeBonus, + HitResult.IgnoreHit, + HitResult.IgnoreMiss, }; } diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs index 708b1f02ad..905c4011dc 100644 --- a/osu.Game/Rulesets/Ruleset.cs +++ b/osu.Game/Rulesets/Ruleset.cs @@ -358,6 +358,7 @@ namespace osu.Game.Rulesets case HitResult.None: case HitResult.IgnoreHit: case HitResult.IgnoreMiss: + case HitResult.ComboBreak: // display is handled as a completion count with corresponding "hit" type. case HitResult.LargeTickMiss: case HitResult.SmallTickMiss: @@ -371,11 +372,9 @@ namespace osu.Game.Rulesets /// /// Get all valid s for this ruleset. - /// Generally used for results display purposes, where it can't be determined if zero-count means the user has not achieved any or the type is not used by this ruleset. + /// Used for strict validation purposes. The ruleset should return ALL applicable types here + /// (except and obsolete types). /// - /// - /// is implicitly included. Special types like are ignored even when specified. - /// public virtual IEnumerable GetValidHitResults() => EnumExtensions.GetValuesInOrder(); ///