RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't cap max island size, make repetition nerf more lenient on high bpm, adjust balancing

This commit is contained in:
StanR 2024-08-22 15:59:13 +05:00
parent 3acd00b9b7
commit f1adc6f98c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
View File

@ -60,8 +60,7 @@ public override bool Equals(object? obj)
}
private const int history_time_max = 5 * 1000; // 5 seconds of calculatingRhythmBonus max.
private const double rhythm_multiplier = 1.1;
private const int max_island_size = 7;
private const double rhythm_multiplier = 1.05;
/// <summary>
/// Calculates a rhythm multiplier for the difficulty of the tap associated with historic data of the current <see cref="OsuDifficultyHitObject"/>.
@ -103,7 +102,7 @@ public static double EvaluateDifficultyOf(DifficultyHitObject current)
double prevDelta = prevObj.StrainTime;
double lastDelta = lastObj.StrainTime;
double currRatio = 1.0 + 8.4 * Math.Min(0.5, Math.Pow(Math.Sin(Math.PI / (Math.Min(prevDelta, currDelta) / Math.Max(prevDelta, currDelta))), 2)); // fancy function to calculate rhythmbonuses.
double currRatio = 1.0 + 8.8 * Math.Min(0.5, Math.Pow(Math.Sin(Math.PI / (Math.Min(prevDelta, currDelta) / Math.Max(prevDelta, currDelta))), 2)); // fancy function to calculate rhythmbonuses.
double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.3) / (currObj.HitWindowGreat * 0.3));
@ -117,11 +116,8 @@ public static double EvaluateDifficultyOf(DifficultyHitObject current)
{
if (!(Math.Abs(prevDelta - currDelta) > deltaDifferenceEpsilon))
{
if (island.Deltas.Count < max_island_size)
{
// island is still progressing
island.AddDelta((int)currDelta, deltaDifferenceEpsilon);
}
// island is still progressing
island.AddDelta((int)currDelta, deltaDifferenceEpsilon);
}
else
{
@ -143,7 +139,7 @@ public static double EvaluateDifficultyOf(DifficultyHitObject current)
// repeated island (ex: triplet -> triplet)
double power = logistic(island.AverageDelta(), 4, 0.165, 10);
effectiveRatio *= Math.Min(1.0 / islandCounts[island], Math.Pow(1.0 / islandCounts[island], power));
effectiveRatio *= Math.Min(2.0 / islandCounts[island], Math.Pow(1.0 / islandCounts[island], power));
}
rhythmComplexitySum += Math.Sqrt(effectiveRatio * startRatio) * currHistoricalDecay;