mirror of
https://github.com/ppy/osu.git
synced 2025-01-14 02:13:21 +08:00
Clean up clamp logic relating to slider end estimate
This commit is contained in:
parent
86c6837e5d
commit
7075108062
@ -127,9 +127,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
|
||||
|
||||
// We assume 15% of sliders in a map are difficult since there's no way to tell from the performance calculator.
|
||||
double estimateDifficultSliders = Attributes.SliderCount * 0.15;
|
||||
double estimateSliderEndsDropped = Math.Min(Attributes.SliderCount, Math.Min(countOk + countMeh + countMiss, Attributes.MaxCombo - scoreMaxCombo));
|
||||
|
||||
estimateSliderEndsDropped = Math.Min(estimateSliderEndsDropped, estimateDifficultSliders);
|
||||
double estimateSliderEndsDropped = Math.Min(estimateDifficultSliders, Math.Min(countOk + countMeh + countMiss, Attributes.MaxCombo - scoreMaxCombo));
|
||||
|
||||
double sliderNerfFactor = (1 - Attributes.SliderFactor) * Math.Pow(1 - estimateSliderEndsDropped / estimateDifficultSliders, 3) + Attributes.SliderFactor;
|
||||
aimValue *= Math.Max(Attributes.SliderFactor, sliderNerfFactor);
|
||||
|
Loading…
Reference in New Issue
Block a user