feat: update catch calc

MaxOhn · Sep 29, 2024 · cc0a041 · cc0a041
1 parent c7b5414
commit cc0a041
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/catch/difficulty/mod.rs b/src/catch/difficulty/mod.rs
@@ -18,7 +18,7 @@ pub mod gradual;
 mod object;
 mod skills;
 
-const STAR_SCALING_FACTOR: f64 = 0.153;
+const DIFFICULTY_MULTIPLIER: f64 = 4.59;
 
 pub fn difficulty(
     difficulty: &Difficulty,
@@ -96,7 +96,7 @@ impl DifficultyValues {
     }
 
     pub fn eval(attrs: &mut CatchDifficultyAttributes, movement_difficulty_value: f64) {
-        attrs.stars = movement_difficulty_value.sqrt() * STAR_SCALING_FACTOR;
+        attrs.stars = movement_difficulty_value.sqrt() * DIFFICULTY_MULTIPLIER;
     }
 
     pub fn create_difficulty_objects<'a>(

diff --git a/src/catch/difficulty/skills/movement.rs b/src/catch/difficulty/skills/movement.rs
@@ -11,7 +11,7 @@ const ABSOLUTE_PLAYER_POSITIONING_ERROR: f32 = 16.0;
 const NORMALIZED_HITOBJECT_RADIUS: f32 = 41.0;
 const DIRECTION_CHANGE_BONUS: f64 = 21.0;
 
-const SKILL_MULTIPLIER: f64 = 900.0;
+const SKILL_MULTIPLIER: f64 = 1.0;
 const STRAIN_DECAY_BASE: f64 = 0.2;
 
 const DECAY_WEIGHT: f64 = 0.94;

diff --git a/src/catch/performance/mod.rs b/src/catch/performance/mod.rs
@@ -569,7 +569,7 @@ impl CatchPerformanceInner<'_> {
 
         // NF penalty
         if self.mods.nf() {
-            pp *= 0.9;
+            pp *= (1.0 - 0.02 * f64::from(self.state.misses)).max(0.9);
         }
 
         CatchPerformanceAttributes {