sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement as extension method on IBeatmap

Browse Source 
Implementation has changed slightly to support arbitrary levels of
nested hitobjects.
This commit is contained in:
Dan Balasescu
2022-02-16 12:05:55 +09:00
parent 74a55ead77
commit 215da7e933
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
View File

@ -9,7 +9,6 @@ using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Difficulty.Skills;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
using osu.Game.Rulesets.Osu.Difficulty.Skills;
using osu.Game.Rulesets.Osu.Mods;
@ -62,21 +61,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
double drainRate = beatmap.Difficulty.DrainRate;
int maxCombo = 0;
void countCombo(HitObject ho)
{
if (ho.CreateJudgement().MaxResult.AffectsCombo())
maxCombo++;
}
foreach (HitObject ho in beatmap.HitObjects)
{
countCombo(ho);
foreach (HitObject nested in ho.NestedHitObjects)
countCombo(nested);
}
int maxCombo = beatmap.GetMaxCombo();
int hitCirclesCount = beatmap.HitObjects.Count(h => h is HitCircle);
int sliderCount = beatmap.HitObjects.Count(h => h is Slider);