RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-06 21:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make repetition nerf harsher, buff initial rhythm ratio, small refactoring

Browse Source
This commit is contained in:
StanR 2024-07-19 10:13:50 +05:00
parent 67cb4a2d02
commit bae9625b0b
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
Deltas.Add(existingDelta == default ? delta : existingDelta); Deltas.Add(existingDelta == default ? delta : existingDelta);
} }
public double AverageDelta() => Math.Max(Deltas.Average(), OsuDifficultyHitObject.MIN_DELTA_TIME); public double AverageDelta() => Deltas.Count > 0 ? Math.Max(Deltas.Average(), OsuDifficultyHitObject.MIN_DELTA_TIME) : 0;
public bool IsSimilarPolarity(Island other, double epsilon)
{
// consider islands to be of similar polarity only if they're having the same average delta (we don't want to consider 3 singletaps similar to a triple)
return Math.Abs(AverageDelta() - other.AverageDelta()) < epsilon &&
Deltas.Count % 2 == other.Deltas.Count % 2;
}
public override int GetHashCode() public override int GetHashCode()
{ {
@ -53,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
} }
private const int history_time_max = 5 * 1000; // 5 seconds of calculatingRhythmBonus max. private const int history_time_max = 5 * 1000; // 5 seconds of calculatingRhythmBonus max.
private const double rhythm_multiplier = 1.14; private const double rhythm_multiplier = 1.05;
private const int max_island_size = 7; private const int max_island_size = 7;
/// <summary> /// <summary>
@ -61,8 +68,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
/// </summary> /// </summary>
public static double EvaluateDifficultyOf(DifficultyHitObject current) public static double EvaluateDifficultyOf(DifficultyHitObject current)
{ {
Dictionary<Island, int> islandCounts = new Dictionary<Island, int>();
if (current.BaseObject is Spinner) if (current.BaseObject is Spinner)
return 0; return 0;
@ -70,6 +75,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
var island = new Island(); var island = new Island();
var previousIsland = new Island(); var previousIsland = new Island();
Dictionary<Island, int> islandCounts = new Dictionary<Island, int>();
double startRatio = 0; // store the ratio of the current start of an island to buff for tighter rhythms double startRatio = 0; // store the ratio of the current start of an island to buff for tighter rhythms
@ -97,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
double prevDelta = prevObj.StrainTime; double prevDelta = prevObj.StrainTime;
double lastDelta = lastObj.StrainTime; double lastDelta = lastObj.StrainTime;
double currRatio = 1.0 + 6.0 * 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 + 10.0 * 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)); double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.3) / (currObj.HitWindowGreat * 0.3));
@ -125,23 +131,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
if (prevObj.BaseObject is Slider) // bpm change was from a slider, this is easier typically than circle -> circle if (prevObj.BaseObject is Slider) // bpm change was from a slider, this is easier typically than circle -> circle
effectiveRatio *= 0.25; effectiveRatio *= 0.25;
if (previousIsland.Deltas.Count % 2 == island.Deltas.Count % 2) // repeated island polartiy (2 -> 4, 3 -> 5) if (island.IsSimilarPolarity(previousIsland, deltaDifferenceEpsilon)) // repeated island polartiy (2 -> 4, 3 -> 5)
effectiveRatio *= 0.50; effectiveRatio *= 0.50;
if (lastDelta > prevDelta + deltaDifferenceEpsilon && prevDelta > currDelta + deltaDifferenceEpsilon) // previous increase happened a note ago, 1/1->1/2-1/4, dont want to buff this. if (lastDelta > prevDelta + deltaDifferenceEpsilon && prevDelta > currDelta + deltaDifferenceEpsilon) // previous increase happened a note ago, 1/1->1/2-1/4, dont want to buff this.
effectiveRatio *= 0.125; effectiveRatio *= 0.125;
if (islandCounts.ContainsKey(island)) if (!islandCounts.TryAdd(island, 1))
{ {
islandCounts[island]++; islandCounts[island]++;
// repeated island (ex: triplet -> triplet) // repeated island (ex: triplet -> triplet)
double power = Math.Max(0.75, logistic(island.AverageDelta(), 3, 0.15, 9)); double power = logistic(island.AverageDelta(), 4, 0.165, 10);
effectiveRatio *= Math.Pow(1.0 / islandCounts[island], power); effectiveRatio *= Math.Min(1.0 / islandCounts[island], Math.Pow(1.0 / islandCounts[island], power));
}
else
{
islandCounts.Add(island, 1);
} }
rhythmComplexitySum += Math.Sqrt(effectiveRatio * startRatio) * currHistoricalDecay; rhythmComplexitySum += Math.Sqrt(effectiveRatio * startRatio) * currHistoricalDecay;