h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-13 00:47:19 +08:00
Code Issues Releases Wiki Activity

basis refactor to allow for more complex SR calculations

Browse Source
This commit is contained in:
tsunyoku 2024-12-29 22:00:45 +00:00
parent 988ed374ae
commit 7e4b97d069
2 changed files with 85 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;
@ -36,46 +34,47 @@ namespace osu.Game.Rulesets.Osu.Difficulty
if (beatmap.HitObjects.Count == 0)
return new OsuDifficultyAttributes { Mods = mods };
double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier;
double aimRatingNoSliders = Math.Sqrt(skills[1].DifficultyValue()) * difficulty_multiplier;
double speedRating = Math.Sqrt(skills[2].DifficultyValue()) * difficulty_multiplier;
double speedNotes = ((Speed)skills[2]).RelevantNoteCount();
double difficultSliders = ((Aim)skills[0]).GetDifficultSliders();
double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
double approachRate = preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5;
HitWindows hitWindows = new OsuHitWindows();
hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
double hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
double overallDifficulty = (80 - hitWindowGreat) / 6;
int hitCircleCount = beatmap.HitObjects.Count(h => h is HitCircle);
int sliderCount = beatmap.HitObjects.Count(h => h is Slider);
int spinnerCount = beatmap.HitObjects.Count(h => h is Spinner);
double drainRate = beatmap.Difficulty.DrainRate;
var aim = (Aim)skills.Single(s => s is Aim aimSkill && aimSkill.WithSliders);
var aimNoSliders = (Aim)skills.Single(s => s is Aim aimSkill && !aimSkill.WithSliders);
var speed = (Speed)skills.Single(s => s is Speed);
var flashlight = (Flashlight?)skills.SingleOrDefault(s => s is Flashlight);
double speedNotes = speed.RelevantNoteCount();
double aimDifficultyStrainCount = aim.CountTopWeightedStrains();
double speedDifficultyStrainCount = speed.CountTopWeightedStrains();
double difficultSliders = aim.GetDifficultSliders();
double aimRating = computeAimRating(aim.DifficultyValue(), mods);
double aimRatingNoSliders = computeAimRating(aimNoSliders.DifficultyValue(), mods);
double speedRating = computeSpeedRating(speed.DifficultyValue(), mods);
double flashlightRating = 0.0;
if (mods.Any(h => h is OsuModFlashlight))
flashlightRating = Math.Sqrt(skills[3].DifficultyValue()) * difficulty_multiplier;
if (flashlight is not null)
flashlightRating = computeFlashlightRating(flashlight.DifficultyValue(), mods);
double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
double aimDifficultyStrainCount = ((OsuStrainSkill)skills[0]).CountTopWeightedStrains();
double speedDifficultyStrainCount = ((OsuStrainSkill)skills[2]).CountTopWeightedStrains();
if (mods.Any(m => m is OsuModTouchDevice))
{
aimRating = Math.Pow(aimRating, 0.8);
flashlightRating = Math.Pow(flashlightRating, 0.8);
}
if (mods.Any(h => h is OsuModRelax))
{
aimRating *= 0.9;
speedRating = 0.0;
flashlightRating *= 0.7;
}
else if (mods.Any(h => h is OsuModAutopilot))
{
speedRating *= 0.5;
aimRating = 0.0;
flashlightRating *= 0.4;
}
double baseAimPerformance = OsuStrainSkill.DifficultyToPerformance(aimRating);
double baseSpeedPerformance = OsuStrainSkill.DifficultyToPerformance(speedRating);
double baseFlashlightPerformance = 0.0;
if (mods.Any(h => h is OsuModFlashlight))
baseFlashlightPerformance = Flashlight.DifficultyToPerformance(flashlightRating);
double baseFlashlightPerformance = Flashlight.DifficultyToPerformance(flashlightRating);
double basePerformance =
Math.Pow(
@ -88,18 +87,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
? Math.Cbrt(OsuPerformanceCalculator.PERFORMANCE_BASE_MULTIPLIER) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4)
: 0;
double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
double drainRate = beatmap.Difficulty.DrainRate;
int hitCirclesCount = beatmap.HitObjects.Count(h => h is HitCircle);
int sliderCount = beatmap.HitObjects.Count(h => h is Slider);
int spinnerCount = beatmap.HitObjects.Count(h => h is Spinner);
HitWindows hitWindows = new OsuHitWindows();
hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
double hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
OsuDifficultyAttributes attributes = new OsuDifficultyAttributes
{
StarRating = starRating,
@ -112,11 +99,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
SliderFactor = sliderFactor,
AimDifficultStrainCount = aimDifficultyStrainCount,
SpeedDifficultStrainCount = speedDifficultyStrainCount,
ApproachRate = preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5,
OverallDifficulty = (80 - hitWindowGreat) / 6,
ApproachRate = approachRate,
OverallDifficulty = overallDifficulty,
DrainRate = drainRate,
MaxCombo = beatmap.GetMaxCombo(),
HitCircleCount = hitCirclesCount,
HitCircleCount = hitCircleCount,
SliderCount = sliderCount,
SpinnerCount = spinnerCount,
};
@ -124,6 +111,50 @@ namespace osu.Game.Rulesets.Osu.Difficulty
return attributes;
}
private double computeAimRating(double aimDifficultyValue, Mod[] mods)
{
if (mods.Any(m => m is OsuModAutopilot))
return 0;
double aimRating = Math.Sqrt(aimDifficultyValue) * difficulty_multiplier;
if (mods.Any(m => m is OsuModTouchDevice))
aimRating = Math.Pow(aimRating, 0.8);
if (mods.Any(m => m is OsuModRelax))
aimRating *= 0.9;
return aimRating;
}
private double computeSpeedRating(double speedDifficultyValue, Mod[] mods)
{
if (mods.Any(m => m is OsuModRelax))
return 0;
double speedRating = Math.Sqrt(speedDifficultyValue) * difficulty_multiplier;
if (mods.Any(m => m is OsuModAutopilot))
speedRating *= 0.5;
return speedRating;
}
private double computeFlashlightRating(double flashlightDifficultyValue, Mod[] mods)
{
double flashlightRating = Math.Sqrt(flashlightDifficultyValue) * difficulty_multiplier;
if (mods.Any(m => m is OsuModTouchDevice))
flashlightRating = Math.Pow(flashlightRating, 0.8);
if (mods.Any(m => m is OsuModRelax))
flashlightRating *= 0.7;
else if (mods.Any(m => m is OsuModAutopilot))
flashlightRating *= 0.4;
return flashlightRating;
}
protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
{
List<DifficultyHitObject> objects = new List<DifficultyHitObject>();

8
osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
View File

@ -19,11 +19,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
public Aim(Mod[] mods, bool withSliders)
: base(mods)
{
this.withSliders = withSliders;
WithSliders = withSliders;
}
private readonly bool withSliders;
private double currentStrain;
private double skillMultiplier => 25.18;
@ -31,6 +29,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private readonly List<double> sliderStrains = new List<double>();
public readonly bool WithSliders;
private double strainDecay(double ms) => Math.Pow(strainDecayBase, ms / 1000);
protected override double CalculateInitialStrain(double time, DifficultyHitObject current) => currentStrain * strainDecay(time - current.Previous(0).StartTime);
@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
protected override double StrainValueAt(DifficultyHitObject current)
{
currentStrain *= strainDecay(current.DeltaTime);
currentStrain += AimEvaluator.EvaluateDifficultyOf(current, withSliders) * skillMultiplier;
currentStrain += AimEvaluator.EvaluateDifficultyOf(current, WithSliders) * skillMultiplier;
if (current.BaseObject is Slider)
{