diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs index c5a9675b3d..92dbfe7081 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs @@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators private const double single_spacing_threshold = OsuDifficultyHitObject.NORMALISED_DIAMETER * 1.25; // 1.25 circles distance between centers private const double min_speed_bonus = 200; // 200 BPM 1/4th private const double speed_balancing_factor = 40; - private const double distance_multiplier = 0.85; + private const double distance_multiplier = 0.9; /// /// Evaluates the difficulty of tapping the current object, based on: diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs index d3867837d4..5616ae72e4 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs @@ -18,11 +18,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty [JsonProperty("accuracy")] public double Accuracy { get; set; } - [JsonProperty("flashlight")] - public double Flashlight { get; set; } - - [JsonProperty("reading")] - public double Reading { get; set; } + [JsonProperty("cognition")] + public double Cognition { get; set; } [JsonProperty("effective_miss_count")] public double EffectiveMissCount { get; set; } @@ -35,8 +32,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty yield return new PerformanceDisplayAttribute(nameof(Aim), "Aim", Aim); yield return new PerformanceDisplayAttribute(nameof(Speed), "Speed", Speed); yield return new PerformanceDisplayAttribute(nameof(Accuracy), "Accuracy", Accuracy); - yield return new PerformanceDisplayAttribute(nameof(Reading), "Reading", Reading); - yield return new PerformanceDisplayAttribute(nameof(Flashlight), "Flashlight Bonus", Flashlight); + yield return new PerformanceDisplayAttribute(nameof(Cognition), "Cognition", Cognition); } } } diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs index 697ab9310d..b03d539504 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs @@ -139,20 +139,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty (Math.Pow(Math.Pow(mechanicalValue, power) + Math.Pow(accuracyValue, power), 1.0 / power) + cognitionValue) * multiplier; - // Fancy stuff for better visual display of FL pp - - // Calculate reading difficulty as there was no FL in the first place - double visualCognitionValue = AdjustCognitionPerformance(readingARValue, mechanicalValue, flashlightValue); - - double visualFlashlightValue = cognitionValue - visualCognitionValue; - return new OsuPerformanceAttributes { Aim = aimValue, Speed = speedValue, Accuracy = accuracyValue, - Flashlight = visualFlashlightValue, - Reading = visualCognitionValue, + Cognition = cognitionValue, EffectiveMissCount = effectiveMissCount, Total = totalValue }; diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs index e99efdf50e..cfb8dec2b8 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs @@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills private readonly bool withSliders; protected double CurrentStrain; - protected double SkillMultiplier => 25.5; + protected double SkillMultiplier => 25.3; protected override double CalculateInitialStrain(double time, DifficultyHitObject current) => CurrentStrain * StrainDecay(time - current.Previous(0).StartTime); diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs index baccf8766d..56b51a915e 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs @@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills /// public class Speed : OsuStrainSkill { - protected double SkillMultiplier => 1.42; + protected double SkillMultiplier => 1.430; protected override double StrainDecayBase => 0.3; protected double CurrentStrain;