wip mania pp update

src/beatmap/converts/mania/pattern_generator/distance_object.rs

@@ -3,6 +3,7 @@ use crate::{
         legacy_random::Random, pattern::Pattern, pattern_type::PatternType,
     },
     curve::Curve,
+    mania::ManiaObject,
     parse::{HitObject, HitSound},
     Beatmap,
 };
@@ -99,7 +100,7 @@ impl<'h> DistanceObjectPatternGenerator<'h> {
         let mut end_time_pattern = Pattern::default();
 
         for obj in orig_pattern.hit_objects {
-            let column = obj.column(self.total_columns as f32);
+            let column = ManiaObject::new(&obj).column(self.total_columns as f32) as u8;
 
             if self.end_time != obj.end_time().round() as i32 {
                 intermediate_pattern.add_object(obj, column);

src/beatmap/converts/mania/pattern_generator/hit_object.rs

@@ -2,6 +2,7 @@ use crate::{
     beatmap::converts::mania::{
         legacy_random::Random, pattern::Pattern, pattern_type::PatternType, PrevValues,
     },
+    mania::ManiaObject,
     parse::{HitObject, HitSound},
     Beatmap,
 };
@@ -103,7 +104,7 @@ impl<'h> HitObjectPatternGenerator<'h> {
     pub(crate) fn generate(&mut self) -> Pattern {
         let pattern = self.generate_core();
 
-        for obj in pattern.hit_objects.iter() {
+        for obj in pattern.hit_objects.iter().map(ManiaObject::new) {
             if self.convert_type.contains(PatternType::STAIR)
                 && obj.column(self.total_columns as f32) as i32 == self.total_columns - 1
             {
@@ -129,7 +130,8 @@ impl<'h> HitObjectPatternGenerator<'h> {
             .prev_pattern
             .hit_objects
             .last()
-            .map_or(0, |h| h.column(self.total_columns as f32));
+            .map(ManiaObject::new)
+            .map_or(0, |h| h.column(self.total_columns as f32) as u8);
 
         let random_start = self.random_start() as u8;
 

src/beatmap/converts/mania/pattern_generator/mod.rs

@@ -1,4 +1,4 @@
-use crate::{parse::HitObject, Beatmap};
+use crate::{mania::ManiaObject, parse::HitObject, Beatmap};
 
 use super::{legacy_random::Random, pattern::Pattern};
 
@@ -26,7 +26,7 @@ trait PatternGenerator {
 
             ((self.hit_object().pos.x / LOCAL_X_DIVISOR).floor() as u8).clamp(0, 6) + 1
         } else {
-            self.hit_object().column(self.total_columns() as f32)
+            ManiaObject::new(self.hit_object()).column(self.total_columns() as f32) as u8
         };
 
         res