From 450aca74c2ab11650c0ac160cc0165553b09bd21 Mon Sep 17 00:00:00 2001 From: Daniel Errington Date: Sun, 25 May 2025 13:28:42 +0100 Subject: [PATCH] Fix up formatting of randommk responses --- src/hal/commands/fun.rs | 30 +++++++++++++++++------ src/hal/commands/mario_kart_randomizer.rs | 4 +-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/hal/commands/fun.rs b/src/hal/commands/fun.rs index 54a52b2..ba346ca 100644 --- a/src/hal/commands/fun.rs +++ b/src/hal/commands/fun.rs @@ -42,14 +42,28 @@ async fn randommk(context: ManifoldContext<'_>, count: u32, balance: bool, insid for combo in combos { context.send(|c| { - c.embed(|embed| { - embed - .title(format!("{combo_number}. {0}, {1}, {2}, {3}", combo.character, combo.body, combo.tires, combo.glider)) - .image(format!("https://mkrandomizer.awsxdr.com/images/characters/{0}.png", combo.character)) - .image(format!("https://mkrandomizer.awsxdr.com/images/bodies/{0}.png", combo.body)) - .image(format!("https://mkrandomizer.awsxdr.com/images/tires/{0}.png", combo.tires)) - .image(format!("https://mkrandomizer.awsxdr.com/images/gliders/{0}.png", combo.glider)) - }) + c + .content(format!("{combo_number}. {0}, {1}, {2}, {3}", combo.character, combo.body, combo.tires, combo.glider)) + .embed(|embed| { + embed + .url("https://mkrandomizer.awsxdr.com/") + .image(format!("https://mkrandomizer.awsxdr.com/images/characters/{0}.png", combo.character)) + }) + .embed(|embed| { + embed + .url("https://mkrandomizer.awsxdr.com/") + .image(format!("https://mkrandomizer.awsxdr.com/images/bodies/{0}.png", combo.body)) + }) + .embed(|embed| { + embed + .url("https://mkrandomizer.awsxdr.com/") + .image(format!("https://mkrandomizer.awsxdr.com/images/tires/{0}.png", combo.tires)) + }) + .embed(|embed| { + embed + .url("https://mkrandomizer.awsxdr.com/") + .image(format!("https://mkrandomizer.awsxdr.com/images/gliders/{0}.png", combo.glider)) + }) }).await?; combo_number += 1; diff --git a/src/hal/commands/mario_kart_randomizer.rs b/src/hal/commands/mario_kart_randomizer.rs index 26c7966..fbc6e78 100644 --- a/src/hal/commands/mario_kart_randomizer.rs +++ b/src/hal/commands/mario_kart_randomizer.rs @@ -58,7 +58,7 @@ impl MarioKartRandomizer { let selection_slice = &scored_combinations[min as usize..max as usize]; - for _ in 1..count { + for _ in 0..count { let combo = selection_slice.choose(&mut random).unwrap(); result.push(combo.combination.clone()); } @@ -71,7 +71,7 @@ impl MarioKartRandomizer { get_kart_combinations() } else { let stats = get_item_stats(); - get_kart_combinations().iter().filter(|k| { stats.bodies[&k.body].inside_drift }).cloned().collect() + get_kart_combinations().iter().filter(|k| { !stats.bodies[&k.body].inside_drift }).cloned().collect() } }