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

Implement predicted pp

Browse source
This commit is contained in:
Natsu Kagami 2020-06-14 00:08:00 -04:00
parent 9f54ca3a1a
commit cbb1e14d93
Signed by: nki
GPG key ID: 73376E117CD20735
1 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
youmubot-osu/src/discord/mod.rs
View file

@ -282,6 +282,31 @@ fn list_plays(plays: &[Score], mode: Mode, ctx: Context, m: &Message) -> Command
}) })
.collect::<Vec<_>>() .collect::<Vec<_>>()
}; };
let pp = plays
.iter()
.map(|p| {
p.pp.map(|pp| format!("{:.2}pp", pp))
.or_else(|| {
beatmap_cache.get_beatmap(p.beatmap_id).ok().and_then(|b| {
mode.to_oppai_mode().and_then(|op| {
b.get_pp_from(
oppai_rs::Combo::NonFC {
max_combo: p.max_combo as u32,
misses: p.count_miss as u32,
},
p.accuracy(mode) as f32,
Some(op),
p.mods,
)
.ok()
.map(|pp| format!("{:.2}pp [?]", pp))
})
})
})
.unwrap_or("-".to_owned())
})
.collect::<Vec<_>>();
let pw = pp.iter().map(|v| v.len()).max().unwrap_or(2);
/*mods width*/ /*mods width*/
let mw = plays let mw = plays
.iter() .iter()
@ -295,31 +320,34 @@ fn list_plays(plays: &[Score], mode: Mode, ctx: Context, m: &Message) -> Command
let mut m = MessageBuilder::new(); let mut m = MessageBuilder::new();
// Table header // Table header
m.push_line(format!( m.push_line(format!(
" # | pp | accuracy | rank | {:mw$} | {:bw$}", " # | {:pw$} | accuracy | rank | {:mw$} | {:bw$}",
"pp",
"mods", "mods",
"beatmap", "beatmap",
pw = pw,
mw = mw, mw = mw,
bw = bw bw = bw
)); ));
m.push_line(format!( m.push_line(format!(
"---------------------------------{:-<mw$}---{:-<bw$}", "------{:-<pw$}---------------------{:-<mw$}---{:-<bw$}",
"", "",
"", "",
"",
pw = pw,
mw = mw, mw = mw,
bw = bw bw = bw
)); ));
// Each row // Each row
for (id, (play, beatmap)) in plays.iter().zip(beatmaps.iter()).enumerate() { for (id, (play, beatmap)) in plays.iter().zip(beatmaps.iter()).enumerate() {
m.push_line(format!( m.push_line(format!(
"{:>3} | {:>6} | {:>8} | {:^4} | {:mw$} | {:bw$}", "{:>3} | {:>pw$} | {:>8} | {:^4} | {:mw$} | {:bw$}",
id + start + 1, id + start + 1,
play.pp pp[id],
.map(|v| format!("{:.2}", v))
.unwrap_or("-".to_owned()),
format!("{:.2}%", play.accuracy(mode)), format!("{:.2}%", play.accuracy(mode)),
play.rank.to_string(), play.rank.to_string(),
play.mods.to_string(), play.mods.to_string(),
beatmap, beatmap,
pw = pw,
mw = mw, mw = mw,
bw = bw bw = bw
)); ));
@ -333,7 +361,9 @@ fn list_plays(plays: &[Score], mode: Mode, ctx: Context, m: &Message) -> Command
total_pages total_pages
)); ));
if let None = mode.to_oppai_mode() { if let None = mode.to_oppai_mode() {
m.push_line("Note: star difficulty don't reflect mods applied."); m.push_line("Note: star difficulty doesn't reflect mods applied.");
} else {
m.push_line("[?] means pp was predicted by oppai-rs.");
} }
(e.content(m.build()), Ok(())) (e.content(m.build()), Ok(()))
}, },