consider custom clock rate for mania & taiko pp calculation

This commit is contained in:
MaxOhn
2022-03-21 19:52:05 +01:00
parent d1acb86ebf
commit b5bee21360
3 changed files with 6 additions and 3 deletions
+2 -1
View File
@@ -1,6 +1,7 @@
## Upcoming ## Upcoming
- Nothing as of now - __Fixes:__
- Performance calculation for taiko & mania now considers custom clock rates properly
# v0.5.0 # v0.5.0
+1 -1
View File
@@ -141,7 +141,7 @@ impl<'map> ManiaPP<'map> {
} }
let mut od = 34.0 + 3.0 * (10.0 - self.map.od as f64).max(0.0).min(10.0); let mut od = 34.0 + 3.0 * (10.0 - self.map.od as f64).max(0.0).min(10.0);
let clock_rate = self.mods.clock_rate(); let clock_rate = self.clock_rate.unwrap_or_else(|| self.mods.clock_rate());
let mut multiplier = 0.8; let mut multiplier = 0.8;
+3 -1
View File
@@ -210,6 +210,7 @@ impl<'map> TaikoPP<'map> {
mods: self.mods, mods: self.mods,
acc: self.acc, acc: self.acc,
n_misses: self.n_misses, n_misses: self.n_misses,
clock_rate: self.clock_rate.unwrap_or_else(|| self.mods.clock_rate()),
}; };
inner.calculate() inner.calculate()
@@ -222,6 +223,7 @@ struct TaikoPPInner<'map> {
mods: u32, mods: u32,
acc: f64, acc: f64,
n_misses: usize, n_misses: usize,
clock_rate: f64,
} }
impl<'map> TaikoPPInner<'map> { impl<'map> TaikoPPInner<'map> {
@@ -285,7 +287,7 @@ impl<'map> TaikoPPInner<'map> {
od *= 0.5; od *= 0.5;
} }
let hit_window = difficulty_range_od(od).floor() / self.mods.clock_rate(); let hit_window = difficulty_range_od(od).floor() / self.clock_rate;
let max_combo = self.attributes.max_combo; let max_combo = self.attributes.max_combo;
(150.0 / hit_window).powf(1.1) (150.0 / hit_window).powf(1.1)