From e338898fcbbc8e43249f3426c7208cdc812f47b5 Mon Sep 17 00:00:00 2001 From: Givikap120 Date: Tue, 21 Jan 2025 17:14:01 +0200 Subject: [PATCH] slight refactor --- .../Difficulty/Evaluators/SpeedEvaluator.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs index df08925f1e..82a7746b94 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs @@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators if (mods.OfType().Any()) distanceBonus = 0; - double sliderStreamBonus = getSliderStreamBonus(current) * sliderstream_multiplier; + double sliderStreamBonus = getSliderStreamBonus(osuCurrObj, osuPrevObj) * sliderstream_multiplier; // Base difficulty with all bonuses double difficulty = (1 + speedBonus + distanceBonus) * (1 + sliderStreamBonus) * 1000 / strainTime; @@ -73,12 +73,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators return difficulty * doubletapness; } - private static double getSliderStreamBonus(DifficultyHitObject current) + private static double getSliderStreamBonus(OsuDifficultyHitObject osuCurrObj, OsuDifficultyHitObject? osuLastObj) { - var osuCurrObj = (OsuDifficultyHitObject)current; - var osuLastObj = (OsuDifficultyHitObject)current.Previous(0); - var osuLastLastObj = (OsuDifficultyHitObject)current.Previous(1); - if (osuCurrObj.BaseObject is not Slider slider || osuLastObj?.BaseObject is not Slider) return 0;