h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 04:43:31 +08:00
Code Issues Releases Wiki Activity

Apply code quality changes

Browse Source
This commit is contained in:
js1086 2024-05-23 19:08:32 +01:00
parent 9ff277cfb3
commit 20c54ab697
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
{ {
currentStrain *= strainDecay(current.DeltaTime); currentStrain *= strainDecay(current.DeltaTime);
currentStrain += AimEvaluator.EvaluateDifficultyOf(current, withSliders) * skillMultiplier; currentStrain += AimEvaluator.EvaluateDifficultyOf(current, withSliders) * skillMultiplier;
ObjectStrains.Add(currentStrain);
objectStrains.Add(currentStrain);
return currentStrain; return currentStrain;
} }

16
osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs
View File

@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
/// </summary> /// </summary>
protected virtual double DifficultyMultiplier => DEFAULT_DIFFICULTY_MULTIPLIER; protected virtual double DifficultyMultiplier => DEFAULT_DIFFICULTY_MULTIPLIER;
protected List<double> objectStrains = new List<double>(); protected List<double> ObjectStrains = new List<double>();
protected double difficulty; protected double Difficulty;
protected OsuStrainSkill(Mod[] mods) protected OsuStrainSkill(Mod[] mods)
: base(mods) : base(mods)
@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
public override double DifficultyValue() public override double DifficultyValue()
{ {
difficulty = 0; Difficulty = 0;
double weight = 1; double weight = 1;
// Sections with 0 strain are excluded to avoid worst-case time complexity of the following sort (e.g. /b/2351871). // Sections with 0 strain are excluded to avoid worst-case time complexity of the following sort (e.g. /b/2351871).
@ -64,11 +64,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
// We're sorting from highest to lowest strain. // We're sorting from highest to lowest strain.
foreach (double strain in strains.OrderDescending()) foreach (double strain in strains.OrderDescending())
{ {
difficulty += strain * weight; Difficulty += strain * weight;
weight *= DecayWeight; weight *= DecayWeight;
} }
return difficulty * DifficultyMultiplier; return Difficulty * DifficultyMultiplier;
} }
/// <summary> /// <summary>
@ -77,9 +77,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
/// </summary> /// </summary>
public double CountDifficultStrains() public double CountDifficultStrains()
{ {
double consistentTopStrain = difficulty / 10; // What would the top strain be if all strain values were identical double consistentTopStrain = Difficulty / 10; // What would the top strain be if all strain values were identical
// Use a weighted sum of all strains. Constants are arbitrary and give nice values // Use a weighted sum of all strains. Constants are arbitrary and give nice values
return objectStrains.Sum(s => 1.1 / (1 + Math.Exp(-10 * (s / consistentTopStrain - 0.88)))); return ObjectStrains.Sum(s => 1.1 / (1 + Math.Exp(-10 * (s / consistentTopStrain - 0.88))));
} }
} }
} }

10
osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
View File

@ -41,23 +41,21 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current); currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current);
double totalStrain = currentStrain * currentRhythm; double totalStrain = currentStrain * currentRhythm;
ObjectStrains.Add(totalStrain);
objectStrains.Add(totalStrain);
return totalStrain; return totalStrain;
} }
public double RelevantNoteCount() public double RelevantNoteCount()
{ {
if (objectStrains.Count == 0) if (ObjectStrains.Count == 0)
return 0; return 0;
double maxStrain = objectStrains.Max(); double maxStrain = ObjectStrains.Max();
if (maxStrain == 0) if (maxStrain == 0)
return 0; return 0;
return objectStrains.Sum(strain => 1.0 / (1.0 + Math.Exp(-(strain / maxStrain * 12.0 - 6.0)))); return ObjectStrains.Sum(strain => 1.0 / (1.0 + Math.Exp(-(strain / maxStrain * 12.0 - 6.0))));
} }
} }
} }