Add changes for combo scaling removal

ppy · Mar 7, 2022 · 869bc39 · 869bc39
1 parent d2eb3c1
commit 869bc39
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/include/pp/performance/Beatmap.h b/include/pp/performance/Beatmap.h
@@ -25,6 +25,8 @@ class Beatmap
 		ScoreMultiplier,
 		Flashlight,
 		SliderFactor,
+		AimDifficultStrainCount,
+		SpeedDifficultStrainCount,
 
 		NumTypes,
 	};

diff --git a/include/pp/performance/osu/OsuScore.h b/include/pp/performance/osu/OsuScore.h
@@ -45,6 +45,7 @@ class OsuScore : public Score
 	void computeAccuracyValue(const Beatmap &beatmap);
 	void computeFlashlightValue(const Beatmap &beatmap);
 
+	f32 calculateMissPenalty(f32 missCount, f32 strainCount);
 	f32 getComboScalingFactor(const Beatmap &beatmap);
 };
 

diff --git a/src/performance/Beatmap.cpp b/src/performance/Beatmap.cpp
@@ -14,6 +14,8 @@ const std::unordered_map<std::string, Beatmap::EDifficultyAttributeType> Beatmap
 	{"Score multiplier", ScoreMultiplier},
 	{"Flashlight", Flashlight},
 	{"Slider factor", SliderFactor},
+	{"Aim difficult strain count", AimDifficultStrainCount},
+	{"Speed difficult strain count", SpeedDifficultStrainCount},
 };
 
 Beatmap::Beatmap(s32 id)

diff --git a/src/performance/osu/OsuScore.cpp b/src/performance/osu/OsuScore.cpp
@@ -116,11 +116,8 @@ void OsuScore::computeAimValue(const Beatmap &beatmap)
 					  (numTotalHits > 2000 ? log10(static_cast<f32>(numTotalHits) / 2000.0f) * 0.5f : 0.0f);
 	_aimValue *= lengthBonus;
 
-	// Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
 	if (_effectiveMissCount > 0)
-		_aimValue *= 0.97f * std::pow(1.0f - std::pow(_effectiveMissCount / static_cast<f32>(numTotalHits), 0.775f), _effectiveMissCount);
-
-	_aimValue *= getComboScalingFactor(beatmap);
+		_aimValue *= calculateMissPenalty(_effectiveMissCount, beatmap.DifficultyAttribute(_mods, Beatmap::AimDifficultStrainCount));
 
 	f32 approachRate = beatmap.DifficultyAttribute(_mods, Beatmap::AR);
 	f32 approachRateFactor = 0.0f;
@@ -162,11 +159,8 @@ void OsuScore::computeSpeedValue(const Beatmap &beatmap)
 					  (numTotalHits > 2000 ? log10(static_cast<f32>(numTotalHits) / 2000.0f) * 0.5f : 0.0f);
 	_speedValue *= lengthBonus;
 
-	// Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
 	if (_effectiveMissCount > 0)
-		_speedValue *= 0.97f * std::pow(1.0f - std::pow(_effectiveMissCount / static_cast<f32>(numTotalHits), 0.775f), std::pow(_effectiveMissCount, 0.875f));
-
-	_speedValue *= getComboScalingFactor(beatmap);
+		_speedValue *= calculateMissPenalty(_effectiveMissCount, beatmap.DifficultyAttribute(_mods, Beatmap::SpeedDifficultStrainCount));
 
 	f32 approachRate = beatmap.DifficultyAttribute(_mods, Beatmap::AR);
 	f32 approachRateFactor = 0.0f;
@@ -261,6 +255,11 @@ void OsuScore::computeFlashlightValue(const Beatmap &beatmap)
 	_flashlightValue *= 0.98f + std::pow(beatmap.DifficultyAttribute(_mods, Beatmap::OD), 2.0f) / 2500.0f;
 }
 
+f32 OsuScore::calculateMissPenalty(f32 missCount, f32 strainCount)
+{
+	return 0.94f / ((missCount / (2.0f * std::sqrt(strainCount))) + 1.0f);
+}
+
 f32 OsuScore::getComboScalingFactor(const Beatmap &beatmap)
 {
 	float maxCombo = beatmap.DifficultyAttribute(_mods, Beatmap::MaxCombo);