Make bananas explode even on miss

osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs

@@ -10,6 +10,8 @@ namespace osu.Game.Rulesets.Catch.Judgements
         public override bool AffectsCombo => false;
         public override bool IsBonus => true;
 
+        public override bool ShouldExplode => true;
+
         protected override int NumericResultFor(HitResult result)
         {
             switch (result)

osu.Game.Rulesets.Catch/Judgements/CatchBananaShowerJudgement.cs

@@ -1,21 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Catch.Judgements
-{
-    public class CatchBananaShowerJudgement : CatchJudgement
-    {
-        public override bool AffectsCombo => false;
-        public override bool IsBonus => true;
-
-        public CatchBananaShowerJudgement()
-        {
-            Result = HitResult.Perfect;
-        }
-
-        protected override int NumericResultFor(HitResult result) => 0;
-        protected override float HealthIncreaseFor(HitResult result) => 0;
-    }
-}

osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Judgements
@@ -31,6 +32,12 @@ namespace osu.Game.Rulesets.Catch.Judgements
         /// </summary>
         public float HealthIncrease => HealthIncreaseFor(Result);
 
+        /// <summary>
+        /// Whether fruit on the platter should explode or drop.
+        /// Note that this is only checked if the owning object is also <see cref="IHasComboInformation.LastInCombo" />
+        /// </summary>
+        public virtual bool ShouldExplode => IsHit;
+
         /// <summary>
         /// Convert a <see cref="HitResult"/> to a base health increase.
         /// </summary>

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs

@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
@@ -27,11 +26,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                 AddNested(getVisualRepresentation?.Invoke(b));
         }
 
-        protected override void CheckForJudgements(bool userTriggered, double timeOffset)
+        protected override bool ProvidesJudgement => false;
-        {
-            if (timeOffset >= 0)
-                AddJudgement(new CatchBananaShowerJudgement());
-        }
 
         protected override void AddNested(DrawableHitObject h)
         {

osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs

@@ -47,7 +47,6 @@ namespace osu.Game.Rulesets.Catch.Scoring
                     case BananaShower shower:
                         foreach (var _ in shower.NestedHitObjects.Cast<CatchHitObject>())
                             AddJudgement(new CatchBananaJudgement { Result = HitResult.Perfect });
-                        AddJudgement(new CatchBananaShowerJudgement());
                         break;
                     case Fruit _:
                         AddJudgement(new CatchJudgement { Result = HitResult.Perfect });

osu.Game.Rulesets.Catch/UI/CatcherArea.cs

@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.Replays;
@@ -78,12 +79,11 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 if (!fruit.StaysOnPlate)
                     runAfterLoaded(() => MovableCatcher.Explode(caughtFruit));
-
             }
 
             if (fruit.HitObject.LastInCombo)
             {
-                if (judgement.IsHit)
+                if (((CatchJudgement)judgement).ShouldExplode)
                     runAfterLoaded(() => MovableCatcher.Explode());
                 else
                     MovableCatcher.Drop();