From a728119fbe25b5add3c04a7cd59ff0a511914966 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 1 Dec 2020 02:28:00 -0500 Subject: [PATCH] Add combo into ranks --- youmubot-osu/src/discord/server_rank.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/youmubot-osu/src/discord/server_rank.rs b/youmubot-osu/src/discord/server_rank.rs index 4e29915..400eda9 100644 --- a/youmubot-osu/src/discord/server_rank.rs +++ b/youmubot-osu/src/discord/server_rank.rs @@ -362,15 +362,26 @@ async fn show_leaderboard(ctx: &Context, m: &Message, bm: BeatmapWithMode) -> Co .max() .unwrap() .max(4); + let combos = scores + .iter() + .map(|(_, _, v)| format!("{}x", v.max_combo)) + .collect::>(); + let cw = combos + .iter() + .map(|v| v.len()) + .max() + .unwrap() + .max(5); let mut content = MessageBuilder::new(); content .push_line("```") .push_line(format!( - "rank | {:>pw$} | {:mdw$} | {:rw$} | {:>aw$} | {:mw$} | {:uw$}", + "rank | {:>pw$} | {:mdw$} | {:rw$} | {:>aw$} | {:>cw$} | {:mw$} | {:uw$}", "pp", "mods", "rank", "acc", + "combo", "miss", "user", pw = pw, @@ -379,9 +390,11 @@ async fn show_leaderboard(ctx: &Context, m: &Message, bm: BeatmapWithMode) -> Co aw = aw, mw = mw, uw = uw, + cw = cw, )) .push_line(format!( - "-------{:- Co aw = aw, mw = mw, uw = uw, + cw = cw, )); for (id, (_, member, p)) in scores.iter().enumerate() { content.push_line_safe(format!( - "{:>4} | {:>pw$} | {:>mdw$} | {:>rw$} | {:>aw$} | {:>mw$} | {:uw$}", + "{:>4} | {:>pw$} | {:>mdw$} | {:>rw$} | {:>aw$} | {:>cw$} | {:>mw$} | {:uw$}", format!("#{}", 1 + id + start), pp[id], p.mods.to_string(), ranks[id], accuracies[id], + combos[id], misses[id], member, pw = pw, mdw = mdw, rw = rw, aw = aw, + cw = cw, mw = mw, uw = uw, ));