From 39fb5712f1a331720014ee5f8a62ca2261ba4741 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Thu, 9 May 2019 15:31:37 +0900 Subject: [PATCH 1/4] Only combo-incrementing results add to result count --- osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index 0ca92a8861..6beb393367 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -314,11 +314,11 @@ namespace osu.Game.Rulesets.Scoring JudgedHits++; - if (result.Type != HitResult.None) - scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) + 1; - if (result.Judgement.AffectsCombo) { + if (result.Type != HitResult.None) + scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) + 1; + switch (result.Type) { case HitResult.None: From b0e34d86d5016cb069a388dfe187decd0502a890 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Thu, 9 May 2019 16:16:20 +0900 Subject: [PATCH 2/4] Subtract a result from count if its been reverted --- osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index 6beb393367..2944b784ad 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -360,6 +360,12 @@ namespace osu.Game.Rulesets.Scoring JudgedHits--; + if (result.Judgement.AffectsCombo) + { + if (result.Type != HitResult.None) + scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) - 1; + } + if (result.Judgement.IsBonus) { if (result.IsHit) From 9e0af723cca8acca9bb4fad33e60da8ed5cadae8 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Thu, 9 May 2019 18:56:19 +0900 Subject: [PATCH 3/4] Split out affectscombo change --- osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index 2944b784ad..4adc29853d 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -314,11 +314,11 @@ namespace osu.Game.Rulesets.Scoring JudgedHits++; + if (result.Type != HitResult.None) + scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) + 1; + if (result.Judgement.AffectsCombo) { - if (result.Type != HitResult.None) - scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) + 1; - switch (result.Type) { case HitResult.None: From 5c096cbc910172aab8948576912acab0da033593 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Thu, 9 May 2019 18:59:00 +0900 Subject: [PATCH 4/4] Revert mirroring condition too --- osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index 4adc29853d..cf42a70640 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -360,11 +360,8 @@ namespace osu.Game.Rulesets.Scoring JudgedHits--; - if (result.Judgement.AffectsCombo) - { - if (result.Type != HitResult.None) - scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) - 1; - } + if (result.Type != HitResult.None) + scoreResultCounts[result.Type] = scoreResultCounts.GetOrDefault(result.Type) - 1; if (result.Judgement.IsBonus) {