remove mysql dependency and readd comboscaling

osuthailand · May 28, 2024 · 4fe4e03 · 4fe4e03
1 parent 59d196a
commit 4fe4e03
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,6 @@ tracing = ["rosu-map/tracing"]
 
 [dependencies]
 rosu-map = { version = "0.1.1" }
-mysql = "*"
 
 [dev-dependencies]
 proptest = "1.4.0"

diff --git a/src/osu/difficulty/mod.rs b/src/osu/difficulty/mod.rs
@@ -155,7 +155,7 @@ impl DifficultyValues {
     ) {
         let mut aim_rating = aim_difficulty_value.sqrt() * DIFFICULTY_MULTIPLIER;
         let aim_rating_no_sliders = aim_no_sliders_difficulty_value.sqrt() * DIFFICULTY_MULTIPLIER;
-        let mut speed_rating = speed_difficulty_value.sqrt() * DIFFICULTY_MULTIPLIER;
+        let speed_rating = speed_difficulty_value.sqrt() * DIFFICULTY_MULTIPLIER;
         let mut flashlight_rating = flashlight_difficulty_value.sqrt() * DIFFICULTY_MULTIPLIER;
 
         let slider_factor = if aim_rating > 0.0 {

diff --git a/src/osu/performance/mod.rs b/src/osu/performance/mod.rs
@@ -808,8 +808,10 @@ impl OsuPerformanceInner {
     }
 
     fn get_combo_scaling_factor(&self) -> f64 {
-        if self.attrs.max_combo == 0 || self.mods.rx() {
+        if self.attrs.max_combo == 0 {
             1.0
+        } else if self.mods.rx() {
+            ((f64::from(self.state.max_combo) / f64::from(self.attrs.max_combo)).log10() * 0.56 + 1.0).min(0.0).max(1.0)
         } else {
             (f64::from(self.state.max_combo).powf(0.8) / f64::from(self.attrs.max_combo).powf(0.8))
                 .min(1.0)