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

some refactorings

Browse Source
This commit is contained in:
Givikap120 2024-10-19 16:09:53 +03:00
parent f8e2874afd
commit eefaa0f9e5
2 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,25 @@ namespace osu.Game.Rulesets.Osu.Difficulty
effectiveMissCount = Math.Min(effectiveMissCount + countOk * okMultiplier + countMeh * mehMultiplier, totalHits); effectiveMissCount = Math.Min(effectiveMissCount + countOk * okMultiplier + countMeh * mehMultiplier, totalHits);
} }
OsuPerformanceAttributes performanceAttributes = calculatePerformanceAttributes(score, osuAttributes);
double savedEffectiveMissCount = effectiveMissCount;
effectiveMissCount = 0;
countMiss = 0;
scoreMaxCombo = osuAttributes.MaxCombo;
double balanceAdjustingMultiplier = calculateBalancerAdjustingMultiplier(score, osuAttributes);
multiplier *= balanceAdjustingMultiplier;
performanceAttributes.Total *= multiplier;
return performanceAttributes;
}
// Internal function
private OsuPerformanceAttributes calculatePerformanceAttributes(ScoreInfo score, OsuDifficultyAttributes osuAttributes)
{
double power = OsuDifficultyCalculator.SUM_POWER; double power = OsuDifficultyCalculator.SUM_POWER;
double aimValue = computeAimValue(score, osuAttributes); double aimValue = computeAimValue(score, osuAttributes);
@ -98,16 +117,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
// Add cognition value without LP-sum cuz otherwise it makes balancing harder // Add cognition value without LP-sum cuz otherwise it makes balancing harder
double totalValue = double totalValue =
(Math.Pow(Math.Pow(mechanicalValue, power) + Math.Pow(accuracyValue, power), 1.0 / power) (Math.Pow(Math.Pow(mechanicalValue, power) + Math.Pow(accuracyValue, power), 1.0 / power)
+ cognitionValue) * multiplier; + cognitionValue);
double savedEffectiveMissCount = effectiveMissCount;
effectiveMissCount = 0;
countMiss = 0;
scoreMaxCombo = osuAttributes.MaxCombo;
double balanceAdjustingMultiplier = calculateBalancerAdjustingMultiplier(score, osuAttributes);
totalValue *= balanceAdjustingMultiplier;
// Fancy stuff for better visual display of FL pp // Fancy stuff for better visual display of FL pp
@ -395,40 +405,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
private double calculateBalancerAdjustingMultiplier(ScoreInfo score, OsuDifficultyAttributes osuAttributes) private double calculateBalancerAdjustingMultiplier(ScoreInfo score, OsuDifficultyAttributes osuAttributes)
{ {
double multiplier = PERFORMANCE_BASE_MULTIPLIER; double totalValue = calculatePerformanceAttributes(score, osuAttributes).Total * PERFORMANCE_BASE_MULTIPLIER;
double power = OsuDifficultyCalculator.SUM_POWER;
double aimValue = computeAimValue(score, osuAttributes);
double speedValue = computeSpeedValue(score, osuAttributes);
double mechanicalValue = Math.Pow(Math.Pow(aimValue, power) + Math.Pow(speedValue, power), 1.0 / power);
// Cognition
double lowARValue = computeReadingLowARValue(score, osuAttributes);
double highARValue = computeReadingHighARValue(score, osuAttributes);
double readingARValue = Math.Pow(Math.Pow(lowARValue, power) + Math.Pow(highARValue, power), 1.0 / power);
double flashlightValue = computeFlashlightValue(score, osuAttributes);
double readingHDValue = 0;
if (score.Mods.Any(h => h is OsuModHidden))
readingHDValue = computeReadingHiddenValue(score, osuAttributes);
// Reduce AR reading bonus if FL is present
double flPower = OsuDifficultyCalculator.FL_SUM_POWER;
double flashlightARValue = score.Mods.Any(h => h is OsuModFlashlight) ?
Math.Pow(Math.Pow(flashlightValue, flPower) + Math.Pow(readingARValue, flPower), 1.0 / flPower) : readingARValue;
double cognitionValue = flashlightARValue + readingHDValue;
cognitionValue = AdjustCognitionPerformance(cognitionValue, mechanicalValue, flashlightValue);
double accuracyValue = computeAccuracyValue(score, osuAttributes);
// Add cognition value without LP-sum cuz otherwise it makes balancing harder
double totalValue =
(Math.Pow(Math.Pow(mechanicalValue, power) + Math.Pow(accuracyValue, power), 1.0 / power)
+ cognitionValue) * multiplier;
if (totalValue < 600) if (totalValue < 600)
return 1; return 1;

9
osu.Game.Rulesets.Osu/Difficulty/Skills/Reading.cs
View File

@ -130,8 +130,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private HighARAimComponent aimComponent; private HighARAimComponent aimComponent;
private HighARSpeedComponent speedComponent; private HighARSpeedComponent speedComponent;
private readonly List<double> difficulties = new List<double>();
private int objectsCount = 0; private int objectsCount = 0;
private double objectsPreemptSum = 0; private double objectsPreemptSum = 0;
@ -150,8 +148,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
double mergedDifficulty = Math.Pow( double mergedDifficulty = Math.Pow(
Math.Pow(aimComponent.CurrentSectionPeak, power) + Math.Pow(aimComponent.CurrentSectionPeak, power) +
Math.Pow(speedComponent.CurrentSectionPeak, power), 1.0 / power); Math.Pow(speedComponent.CurrentSectionPeak, power), 1.0 / power);
mergedDifficulty *= skill_multiplier;
difficulties.Add(mergedDifficulty);
if (current.Index == 0) if (current.Index == 0)
CurrentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength; CurrentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength;
@ -216,8 +213,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
{ {
} }
protected new double SkillMultiplier => base.SkillMultiplier;
protected override double StrainValueAt(DifficultyHitObject current) protected override double StrainValueAt(DifficultyHitObject current)
{ {
CurrentStrain *= StrainDecay(current.DeltaTime); CurrentStrain *= StrainDecay(current.DeltaTime);
@ -238,8 +233,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
{ {
} }
protected new double SkillMultiplier => base.SkillMultiplier;
protected override double StrainValueAt(DifficultyHitObject current) protected override double StrainValueAt(DifficultyHitObject current)
{ {
OsuDifficultyHitObject currObj = (OsuDifficultyHitObject)current; OsuDifficultyHitObject currObj = (OsuDifficultyHitObject)current;