From c0b65a6a73c694825cbd6ec770ca01068c8da436 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jun 2018 17:07:08 +0900
Subject: [PATCH] Change default IsBonus definition and remove unnecessary
 overrides

---
 osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs      | 1 -
 osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs         | 1 -
 osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs     | 1 -
 osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs      | 1 -
 .../Judgements/TaikoDrumRollTickJudgement.cs                    | 1 -
 osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs   | 1 -
 osu.Game/Rulesets/Judgements/Judgement.cs                       | 2 +-
 7 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
index b0b00d8a42..c39e663d75 100644
--- a/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
+++ b/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
     public class CatchBananaJudgement : CatchJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool IsBonus => true;
 
         public override bool ShouldExplode => true;
 
diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs
index 9c78360911..9055e48a4c 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
     public class HoldNoteJudgement : ManiaJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool IsBonus => true;
 
         protected override int NumericResultFor(HitResult result) => 0;
     }
diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
index 5d38e70d01..6eb5a79200 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
     public class HoldNoteTickJudgement : ManiaJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool IsBonus => true;
 
         protected override int NumericResultFor(HitResult result) => 20;
     }
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs
index fc85ec8764..d52de9f971 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Osu.Judgements
     public class OsuSliderTailJudgement : OsuJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool IsBonus => true;
 
         protected override int NumericResultFor(HitResult result) => 0;
     }
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
index 17bd2d9608..446dd0d11b 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Taiko.Judgements
     public class TaikoDrumRollTickJudgement : TaikoJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool IsBonus => true;
 
         protected override int NumericResultFor(HitResult result)
         {
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs
index dbfd38e6f9..288ad236aa 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs
@@ -6,7 +6,6 @@ namespace osu.Game.Rulesets.Taiko.Judgements
     public class TaikoStrongHitJudgement : TaikoJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool IsBonus => true;
 
         public TaikoStrongHitJudgement()
         {
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 3d70b23773..0937757981 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -52,7 +52,7 @@ public class Judgement
         /// <summary>
         /// Whether the <see cref="Result"/> should be counted as base or bonus score.
         /// </summary>
-        public virtual bool IsBonus => false;
+        public virtual bool IsBonus => !AffectsCombo;
 
         /// <summary>
         /// The numeric representation for the result achieved.