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

Added full-memory cap

Browse Source 
Now reading difficulty caps at some value if mechanical difficulty and length is too low
This commit is contained in:
Givikap120 2024-01-26 17:22:25 +02:00
parent f6df24779d
commit cede416d41
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,19 +84,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double baseReadingSliderPerformance = 0;
double baseReadingNonARPerformance = baseReadingHiddenPerformance + baseReadingSliderPerformance;
double basePerformance =
Math.Pow(
Math.Pow(baseAimPerformance, SumPower) +
Math.Pow(baseSpeedPerformance, SumPower) +
Math.Pow(baseFlashlightARPerformance, SumPower) +
Math.Pow(baseReadingNonARPerformance, SumPower)
, 1.0 / SumPower
);
double starRating = basePerformance > 0.00001
? 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 maxCombo = beatmap.GetMaxCombo();
@ -105,6 +92,22 @@ namespace osu.Game.Rulesets.Osu.Difficulty
int sliderCount = beatmap.HitObjects.Count(h => h is Slider);
int spinnerCount = beatmap.HitObjects.Count(h => h is Spinner);
// Limit cognition by full memorisation difficulty
double mechanicalPerformance = Math.Pow(Math.Pow(baseAimPerformance, SumPower) + Math.Pow(baseSpeedPerformance, SumPower), 1.0 / SumPower);
double cognitionPerformance = Math.Pow(Math.Pow(baseFlashlightARPerformance, SumPower) + Math.Pow(baseReadingNonARPerformance, SumPower), 1.0 / SumPower);
cognitionPerformance = OsuPerformanceCalculator.AdjustCognitionPerformance(mechanicalPerformance, cognitionPerformance, hitCirclesCount + sliderCount);
double basePerformance =
Math.Pow(
Math.Pow(mechanicalPerformance, SumPower) +
Math.Pow(cognitionPerformance, SumPower)
, 1.0 / SumPower
);
double starRating = basePerformance > 0.00001
? Math.Cbrt(OsuPerformanceCalculator.PERFORMANCE_BASE_MULTIPLIER) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4)
: 0;
HitWindows hitWindows = new OsuHitWindows();
hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);

31
osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
View File

@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double aimValue = computeAimValue(score, osuAttributes);
double speedValue = computeSpeedValue(score, osuAttributes);
double accuracyValue = computeAccuracyValue(score, osuAttributes);
double mechanicalValue = Math.Pow(Math.Pow(aimValue, SumPower) + Math.Pow(speedValue, SumPower), 1.0 / SumPower);
// Cognition
@ -76,13 +76,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double readingNonARValue = computeReadingNonARValue(score, osuAttributes);
double cognitionValue = Math.Pow(Math.Pow(flashlightARValue, SumPower) + Math.Pow(readingNonARValue, SumPower), 1.0 / SumPower);
cognitionValue = AdjustCognitionPerformance(mechanicalValue, cognitionValue, totalHits);
double accuracyValue = computeAccuracyValue(score, osuAttributes);
double totalValue =
Math.Pow(
Math.Pow(aimValue, SumPower) +
Math.Pow(speedValue, SumPower) +
Math.Pow(accuracyValue, SumPower) +
Math.Pow(cognitionValue, SumPower), 1.0 / SumPower
Math.Pow(mechanicalValue, SumPower) +
Math.Pow(cognitionValue, SumPower) +
Math.Pow(accuracyValue, SumPower), 1.0 / SumPower
) * multiplier;
return new OsuPerformanceAttributes
@ -365,8 +367,25 @@ namespace osu.Game.Rulesets.Osu.Difficulty
return Math.Max(countMiss, comboBasedMissCount);
}
private double getComboScalingFactor(OsuDifficultyAttributes attributes) => attributes.MaxCombo <= 0 ? 1.0 : Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(attributes.MaxCombo, 0.8), 1.0);
private int totalHits => countGreat + countOk + countMeh + countMiss;
// Adjusts cognition performance accounting for full-memory
public static double AdjustCognitionPerformance(double mechanicalPerformance, double cognitionPerformance, int hitsCount)
{
// Assuming that less than 25 mechanical pp is not worthy for memory
mechanicalPerformance += 25;
// Agressive length bonus, pretty bad but makes the work done
mechanicalPerformance *= 1.0 + hitsCount / 400.0;
// Avoid it being broken on millions of pp, ruins it being continious, but it will never happen on normal circumstances
if (mechanicalPerformance > 10000 || cognitionPerformance > 10000) cognitionPerformance = Math.Min(mechanicalPerformance, cognitionPerformance);
else cognitionPerformance = 100 * softmin(mechanicalPerformance / 100, cognitionPerformance / 100, 100);
return cognitionPerformance;
}
private static double softmin(double a, double b, double power = Math.E) => a * b / Math.Log(Math.Pow(power, a) + Math.Pow(power, b), power);
}
}