From d9182d931bae34cf0bc02bce14cf87933dc9a96f Mon Sep 17 00:00:00 2001 From: Dark98 Date: Mon, 13 Jan 2025 11:24:32 +0100 Subject: [PATCH] Fix class name --- .../Difficulty/Evaluators/ReadingEvaluator.cs | 2 +- .../Evaluators/{SliderAim.cs => SliderAimEvaluator.cs} | 2 +- osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs | 7 +++---- osu.Game.Rulesets.Osu/Difficulty/Skills/SliderAim.cs | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) rename osu.Game.Rulesets.Osu/Difficulty/Evaluators/{SliderAim.cs => SliderAimEvaluator.cs} (99%) diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs index b083cb8c9df6..071382158c6d 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs @@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators { - public static class FlashlightEvaluator + public static class ReadingEvaluator { private const double max_opacity_bonus = 0.4; private const double hidden_bonus = 0.2; diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SliderAim.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SliderAimEvaluator.cs similarity index 99% rename from osu.Game.Rulesets.Osu/Difficulty/Evaluators/SliderAim.cs rename to osu.Game.Rulesets.Osu/Difficulty/Evaluators/SliderAimEvaluator.cs index e0062d599629..32c3db86e934 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SliderAim.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SliderAimEvaluator.cs @@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators { - public static class AimEvaluator + public static class SliderAimEvaluator { private const double wide_angle_multiplier = 1.5; private const double acute_angle_multiplier = 2.6; diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs index d566b3dab8c3..bf8a9d07f3e4 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs @@ -2,7 +2,6 @@ // See the LICENCE file in the repository root for full licence text. using System; -using System.Linq; using osu.Game.Rulesets.Difficulty.Preprocessing; using osu.Game.Rulesets.Difficulty.Skills; using osu.Game.Rulesets.Mods; @@ -13,11 +12,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills /// /// Represents the skill required to memorise and hit every object in a map with the Flashlight mod enabled. /// - public class Flashlight : StrainSkill + public class Reading : StrainSkill { private readonly bool hasHiddenMod; - public Flashlight(Mod[] mods) + public Reading(Mod[] mods) : base(mods) { } @@ -34,7 +33,7 @@ public Flashlight(Mod[] mods) protected override double StrainValueAt(DifficultyHitObject current) { currentStrain *= strainDecay(current.DeltaTime); - currentStrain += FlashlightEvaluator.EvaluateDifficultyOf(Mods, current) * skillMultiplier; + currentStrain += ReadingEvaluator.EvaluateDifficultyOf(Mods, current) * skillMultiplier; return currentStrain; } diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/SliderAim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/SliderAim.cs index 696dac582204..1bef598187b9 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Skills/SliderAim.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/SliderAim.cs @@ -12,9 +12,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills /// /// Represents the skill required to correctly aim at every object in the map with a uniform CircleSize and normalized distances. /// - public class Aim : StrainSkill + public class SliderAim : StrainSkill { - public Aim(Mod[] mods) + public SliderAim(Mod[] mods) : base(mods) { } @@ -31,7 +31,7 @@ public Aim(Mod[] mods) protected override double StrainValueAt(DifficultyHitObject current) { currentStrain *= strainDecay(current.DeltaTime); - currentStrain += AimEvaluator.EvaluateDifficultyOf(Mods, current) * skillMultiplier; + currentStrain += SliderAimEvaluator.EvaluateDifficultyOf(Mods, current) * skillMultiplier; return currentStrain; }