diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs index 9b8bb83bb8..b91f37d84d 100644 --- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs +++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs @@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring /// /// Taiko fails at the end of the map if the player has not half-filled their HP bar. /// - protected override bool DefaultFailCondition => Hits == MaxHits && Health.Value <= 0.5; + protected override bool DefaultFailCondition => JudgedHits == MaxHits && Health.Value <= 0.5; private double hpIncreaseTick; private double hpIncreaseGreat; diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index b321123b74..e8271059ca 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -171,10 +171,10 @@ namespace osu.Game.Rulesets.Scoring public readonly Bindable Mode = new Bindable(); - protected sealed override bool HasCompleted => Hits == MaxHits; + protected sealed override bool HasCompleted => JudgedHits == MaxHits; protected int MaxHits { get; private set; } - protected int Hits { get; private set; } + protected int JudgedHits { get; private set; } private double maxHighestCombo; @@ -259,7 +259,7 @@ namespace osu.Game.Rulesets.Scoring baseScore += judgement.NumericResult; rollingMaxBaseScore += judgement.MaxNumericResult; - Hits++; + JudgedHits++; } else if (judgement.IsHit) bonusScore += judgement.NumericResult; @@ -279,7 +279,7 @@ namespace osu.Game.Rulesets.Scoring baseScore -= judgement.NumericResult; rollingMaxBaseScore -= judgement.MaxNumericResult; - Hits--; + JudgedHits--; } else if (judgement.IsHit) bonusScore -= judgement.NumericResult; @@ -305,14 +305,14 @@ namespace osu.Game.Rulesets.Scoring { if (storeResults) { - MaxHits = Hits; + MaxHits = JudgedHits; maxHighestCombo = HighestCombo; maxBaseScore = baseScore; } base.Reset(storeResults); - Hits = 0; + JudgedHits = 0; baseScore = 0; rollingMaxBaseScore = 0; bonusScore = 0;