Merge pull request ppy#27677 from smoogipoo/fix-catch-banana-fail

Fix catch banana shower judgement causing fail when at 0 HP
MingxuanGame · Mar 21, 2024 · 983385b · 983385b
2 parents c081cc7 + bf56400
commit 983385b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/osu.Game.Rulesets.Catch.Tests/CatchHealthProcessorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchHealthProcessorTest.cs
@@ -19,6 +19,7 @@ [new Fruit(), 0.01, true],
             [new Droplet(), 0.01, true],
             [new TinyDroplet(), 0, false],
             [new Banana(), 0, false],
+            [new BananaShower(), 0, false]
         ];
 
         [TestCaseSource(nameof(test_cases))]

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
@@ -32,6 +32,10 @@ protected override bool CheckDefaultFailCondition(JudgementResult result)
             if (result.Type == HitResult.SmallTickMiss)
                 return false;
 
+            // on stable, banana showers don't exist as concrete objects themselves, so they can't cause a fail.
+            if (result.HitObject is BananaShower)
+                return false;
+
             return base.CheckDefaultFailCondition(result);
         }
 

diff --git a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
@@ -108,6 +108,9 @@ protected override double ComputeDrainRate()
                     increaseHp(h);
                 }
 
+                if (topLevelObjectCount == 0)
+                    return testDrop;
+
                 if (!fail && currentHp < lowestHpEnd)
                 {
                     fail = true;