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

new experimental overlap summing

Browse Source
This commit is contained in:
Givikap120 2024-03-30 14:16:27 +02:00
parent 71df659533
commit 23808be9b2
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
{
private const double reading_window_size = 3000;
private const double overlap_multiplier = 3.5;
private const double overlap_multiplier = 1.8; //3.5
public static double EvaluateDensityOf(DifficultyHitObject current, bool applyDistanceNerf = true)
{
@ -171,21 +171,34 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
var currObj = (OsuDifficultyHitObject)current;
double screenOverlapDifficulty = 0;
List<double> overlapDifficulties = new List<double>();
foreach (var loopObj in retrievePastVisibleObjects(currObj))
{
double lastOverlapness = 0;
foreach (var overlapObj in loopObj.OverlapObjects)
{
if (overlapObj.HitObject.StartTime + overlapObj.HitObject.Preempt >= currObj.StartTime) break;
if (overlapObj.HitObject.StartTime + overlapObj.HitObject.Preempt <= currObj.StartTime) break;
lastOverlapness = overlapObj.Overlapness;
}
screenOverlapDifficulty += lastOverlapness;
overlapDifficulties.Add(lastOverlapness);
//screenOverlapDifficulty += lastOverlapness;
// This is a correct way to do this (paired with changing >= to <=), but somehow it get's more broken
// screenOverlapDifficulty = Math.Max(screenOverlapDifficulty, lastOverlapness);
}
return overlap_multiplier * Math.Max(0, screenOverlapDifficulty - 0.7);
const double decay_weight = 0.5;
double weight = 1.0;
foreach (double difficulty in overlapDifficulties.OrderDescending())
{
screenOverlapDifficulty += difficulty * weight;
weight *= decay_weight;
}
return overlap_multiplier * Math.Max(0, screenOverlapDifficulty - 1.2);
}
public static double EvaluateDifficultyOf(DifficultyHitObject current)
{

2
osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
hasHiddenMod = mods.Any(m => m is OsuModHidden);
}
private double skillMultiplier => 0.054;
private double skillMultiplier => 0.05;
private double strainDecayBase => 0.15;
private double currentStrain;