Merge pull request #200 from MaxOhn/catch-hitresults

Fix maxFruits count
ppy · Mar 4, 2024 · c3cbe41 · c3cbe41
2 parents 64a3f17 + cb9b280
commit c3cbe41
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/PerformanceCalculator/Simulate/CatchSimulateCommand.cs b/PerformanceCalculator/Simulate/CatchSimulateCommand.cs
@@ -58,7 +58,7 @@ protected override Dictionary<HitResult, int> GenerateHitResults(double accuracy
             var maxCombo = GetMaxCombo(beatmap);
             int maxTinyDroplets = beatmap.HitObjects.OfType<JuiceStream>().Sum(s => s.NestedHitObjects.OfType<TinyDroplet>().Count());
             int maxDroplets = beatmap.HitObjects.OfType<JuiceStream>().Sum(s => s.NestedHitObjects.OfType<Droplet>().Count()) - maxTinyDroplets;
-            int maxFruits = beatmap.HitObjects.OfType<Fruit>().Count() + 2 * beatmap.HitObjects.OfType<JuiceStream>().Count() + beatmap.HitObjects.OfType<JuiceStream>().Sum(s => s.RepeatCount);
+            int maxFruits = beatmap.HitObjects.Sum(h => h is Fruit ? 1 : (h as JuiceStream)?.NestedHitObjects.Count(n => n is Fruit) ?? 0);
 
             // Either given or max value minus misses
             int countDroplets = countGood ?? Math.Max(0, maxDroplets - countMiss);