nki/youmubot
1
0
Fork 0
mirror of https://github.com/natsukagami/youmubot.git synced 2025-04-19 16:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert more conservatively with modified DT/HT

Browse source
This commit is contained in:
Natsu Kagami 2024-06-20 15:59:10 +02:00
parent 9d61868771
commit 1441902560
Signed by: nki
GPG key ID: 55A032EB38B49ADB
1 changed files with 114 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
youmubot-osu/src/models/rosu.rs
View file

@ -128,12 +128,7 @@ impl From<rosu::score::Score> for Score {
global_rank: s.rank_global, global_rank: s.rank_global,
effective_pp: s.weight.map(|w| w.pp as f64), effective_pp: s.weight.map(|w| w.pp as f64),
mode: s.mode.into(), mode: s.mode.into(),
mods: s mods: s.mods.into(),
.mods
.iter()
.map(|v| v.intermode())
.collect::<GameModsIntermode>()
.into(),
count_300: legacy_stats.count_300 as u64, count_300: legacy_stats.count_300 as u64,
count_100: legacy_stats.count_100 as u64, count_100: legacy_stats.count_100 as u64,
count_50: legacy_stats.count_50 as u64, count_50: legacy_stats.count_50 as u64,
@ -332,3 +327,116 @@ impl From<rosu::mods::GameModsIntermode> for Mods {
// Mods::from_bits_truncate(value.bits() as u64) // Mods::from_bits_truncate(value.bits() as u64)
} }
} }
impl From<rosu::mods::GameMods> for Mods {
fn from(value: rosu::mods::GameMods) -> Self {
value
.iter()
.cloned()
.filter_map(|m| match m {
rosu::mods::GameMod::HalfTimeOsu(ht)
if ht.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreOsu(dc)
if dc.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreOsu(_) => {
Some(rosu::mods::GameMod::HalfTimeOsu(rosu::mods::HalfTimeOsu {
speed_change: None,
adjust_pitch: Some(true),
}))
}
rosu::mods::GameMod::DoubleTimeOsu(dt)
if dt.speed_change.is_some_and(|v| v != 1.5) =>
{
None
}
rosu::mods::GameMod::NightcoreOsu(nc)
if nc.speed_change.is_some_and(|v| v != 1.5) =>
{
None
}
rosu::mods::GameMod::HalfTimeTaiko(ht)
if ht.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreTaiko(dc)
if dc.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreTaiko(_) => Some(rosu::mods::GameMod::HalfTimeTaiko(
rosu::mods::HalfTimeTaiko {
speed_change: None,
adjust_pitch: Some(true),
},
)),
rosu::mods::GameMod::DoubleTimeTaiko(dt)
if dt.speed_change.is_some_and(|v| v != 1.5) =>
{
None
}
rosu::mods::GameMod::NightcoreTaiko(nc)
if nc.speed_change.is_some_and(|v| v != 1.5) =>
{
None
}
rosu::mods::GameMod::HalfTimeCatch(ht)
if ht.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreCatch(dc)
if dc.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreCatch(_) => Some(rosu::mods::GameMod::HalfTimeCatch(
rosu::mods::HalfTimeCatch {
speed_change: None,
adjust_pitch: Some(true),
},
)),
rosu::mods::GameMod::DoubleTimeCatch(dt)
if dt.speed_change.is_some_and(|v| v != 1.5) =>
{
None
}
rosu::mods::GameMod::NightcoreCatch(nc)
if nc.speed_change.is_some_and(|v| v != 1.5) =>
{
None
}
rosu::mods::GameMod::HalfTimeMania(ht)
if ht.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreMania(dc)
if dc.speed_change.is_some_and(|v| v != 0.75) =>
{
None
}
rosu::mods::GameMod::DaycoreMania(_) => Some(rosu::mods::GameMod::HalfTimeMania(
rosu::mods::HalfTimeMania {
speed_change: None,
adjust_pitch: Some(true),
},
)),
rosu::mods::GameMod::DoubleTimeMania(dt)
if dt.speed_change.is_some_and(|v| v != 1.5) =>
{
None
}
_ => Some(m),
})
.map(|v| v.intermode())
.collect::<GameModsIntermode>()
.into()
}
}