EZPPFarm/akatsuki-pp-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: set speed distance to 0 when using autopilot

Browse Source
This commit is contained in:
tsunyoku
2022-11-12 13:53:46 +00:00
parent 1a350a6cee
commit 297419543f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osu/skills/speed.rs
+11 -5
View File
@@ -1,6 +1,6 @@
use std::{cmp::Ordering, f64::consts::PI}; use std::{cmp::Ordering, f64::consts::PI};
use crate::osu::difficulty_object::OsuDifficultyObject; use crate::{osu::difficulty_object::OsuDifficultyObject, Mods};
use super::{next, previous, previous_start_time, OsuStrainSkill, Skill, StrainSkill}; use super::{next, previous, previous_start_time, OsuStrainSkill, Skill, StrainSkill};
@@ -90,8 +90,9 @@ impl StrainSkill for Speed {
diff_objects: &[OsuDifficultyObject<'_>], diff_objects: &[OsuDifficultyObject<'_>],
) -> f64 { ) -> f64 {
self.curr_strain *= Self::strain_decay(curr.strain_time); self.curr_strain *= Self::strain_decay(curr.strain_time);
self.curr_strain += SpeedEvaluator::evaluate_diff_of(curr, diff_objects, self.hit_window) self.curr_strain +=
* Self::SKILL_MULTIPLIER; SpeedEvaluator::evaluate_diff_of(curr, diff_objects, self.hit_window, self.mods)
* Self::SKILL_MULTIPLIER;
self.curr_rhythm = RhythmEvaluator::evaluate_diff_of(curr, diff_objects, self.hit_window); self.curr_rhythm = RhythmEvaluator::evaluate_diff_of(curr, diff_objects, self.hit_window);
let total_strain = self.curr_strain * self.curr_rhythm; let total_strain = self.curr_strain * self.curr_rhythm;
@@ -133,6 +134,7 @@ impl SpeedEvaluator {
curr: &OsuDifficultyObject<'_>, curr: &OsuDifficultyObject<'_>,
diff_objects: &[OsuDifficultyObject<'_>], diff_objects: &[OsuDifficultyObject<'_>],
hit_window: f64, hit_window: f64,
mods: u32,
) -> f64 { ) -> f64 {
if curr.base.is_spinner() { if curr.base.is_spinner() {
return 0.0; return 0.0;
@@ -171,8 +173,12 @@ impl SpeedEvaluator {
}; };
let travel_dist = osu_prev_obj.map_or(0.0, |obj| obj.dists.travel_dist); let travel_dist = osu_prev_obj.map_or(0.0, |obj| obj.dists.travel_dist);
let dist = let dist = match mods.ap() {
Self::SINGLE_SPACING_THRESHOLD.min(travel_dist + osu_curr_obj.dists.min_jump_dist); true => 0.0,
false => {
Self::SINGLE_SPACING_THRESHOLD.min(travel_dist + osu_curr_obj.dists.min_jump_dist)
}
};
(speed_bonus + speed_bonus * (dist / Self::SINGLE_SPACING_THRESHOLD).powf(3.5)) (speed_bonus + speed_bonus * (dist / Self::SINGLE_SPACING_THRESHOLD).powf(3.5))
* doubletapness * doubletapness