From 6c42460ea97aed901a707fc1ef63e8e1c9fea78c Mon Sep 17 00:00:00 2001 From: finadoggie <75299710+Finadoggie@users.noreply.github.com> Date: Thu, 16 Jan 2025 22:40:37 -0800 Subject: [PATCH] rename withTapping to withoutFlow to be more accurate --- .../Difficulty/OsuDifficultyCalculator.cs | 2 +- osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs index a2c7e0e15e..14bba60d36 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs @@ -153,8 +153,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty { new Aim(mods, true), new Aim(mods, false), - new Speed(mods, true), new Speed(mods, false), + new Speed(mods, true), }; if (mods.Any(h => h is OsuModFlashlight)) diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs index 1d44ca6d76..ff8188b60e 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs @@ -23,13 +23,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills protected override int ReducedSectionCount => 5; - public Speed(Mod[] mods, bool withTapping) + public Speed(Mod[] mods, bool withoutFlow) : base(mods) { - this.withTapping = withTapping; + this.withoutFlow = withoutFlow; } - private readonly bool withTapping; + private readonly bool withoutFlow; private double strainDecay(double ms) => Math.Pow(strainDecayBase, ms / 1000); @@ -38,9 +38,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills protected override double StrainValueAt(DifficultyHitObject current) { currentStrain *= strainDecay(((OsuDifficultyHitObject)current).StrainTime); - currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current, withTapping, Mods) * skillMultiplier; + currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current, withoutFlow, Mods) * skillMultiplier; - if (!withTapping) return currentStrain; + if (withoutFlow) return currentStrain; currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current);