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

Tweak pp if-fc (again...)

Browse source
This commit is contained in:
Natsu Kagami 2020-06-18 14:35:09 -04:00
parent 1c59873a8f
commit 264272c9cf
Signed by: nki
GPG key ID: 73376E117CD20735
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
youmubot-osu/src/discord/embeds.rs
View file

@ -263,7 +263,7 @@ pub(crate) fn score_embed<'a>(
accuracy, s.max_combo, s.count_miss, v accuracy, s.max_combo, s.count_miss, v
), ),
}; };
let pp = s.pp.map(|pp| format!("{:.2}pp", pp)).or_else(|| { let pp = s.pp.map(|pp| (pp, format!("{:.2}pp", pp))).or_else(|| {
mode.to_oppai_mode() mode.to_oppai_mode()
.and_then(|op| { .and_then(|op| {
content content
@ -275,7 +275,7 @@ pub(crate) fn score_embed<'a>(
) )
.ok() .ok()
}) })
.map(|pp| format!("{:.2}pp [?]", pp)) .map(|pp| (pp as f64, format!("{:.2}pp [?]", pp)))
}); });
let pp = if !s.perfect { let pp = if !s.perfect {
mode.to_oppai_mode() mode.to_oppai_mode()
@ -284,10 +284,18 @@ pub(crate) fn score_embed<'a>(
.get_pp_from(oppai_rs::Combo::FC(0), accuracy as f32, Some(op), s.mods) .get_pp_from(oppai_rs::Combo::FC(0), accuracy as f32, Some(op), s.mods)
.ok() .ok()
}) })
.filter(|&v| s.pp.map(|origin| origin < v as f64).unwrap_or(false)) .filter(|&v| {
.and_then(|value| pp.map(|original| format!("{} ({:.2}pp if FC?)", original, value))) pp.as_ref()
.map(|&(origin, _)| origin < v as f64)
.unwrap_or(false)
})
.and_then(|value| {
pp.as_ref()
.map(|(_, original)| format!("{} ({:.2}pp if FC?)", original, value))
})
.or(pp.map(|v| v.1))
} else { } else {
pp pp.map(|v| v.1)
}; };
let score_line = pp let score_line = pp
.map(|pp| format!("{} | {}", &score_line, pp)) .map(|pp| format!("{} | {}", &score_line, pp))