fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't print unreconcilable addends for a truncated dice listing
All checks were successful
CI / check (push) Successful in 5m28s
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-19 19:52:44 +00:00
parent 3c730f7add
commit cc9c399464
No known key found for this signature in database
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/diceserv/src/roll.rs
View file

@ -60,12 +60,16 @@ pub fn handle(me: &str, from: &Sender, rest: &[&str], ctx: &mut ServiceCtx, exte
// "2d6: 4+5=9" for the extended output. // "2d6: 4+5=9" for the extended output.
fn render_roll(r: &expr::Roll) -> String { fn render_roll(r: &expr::Roll) -> String {
if r.values.len() == 1 { if r.values.len() == 1 {
format!("{}: {}", r.spec, r.total) return format!("{}: {}", r.spec, r.total);
} else { }
// For a huge roll the kept face list is capped, so the addends wouldn't sum to
// the true total — show the total alone rather than a listing that doesn't add up.
if r.values.iter().copied().sum::<u64>() != r.total {
return format!("{}: {} (first {} dice)", r.spec, r.total, r.values.len());
}
let each = r.values.iter().map(u64::to_string).collect::<Vec<_>>().join("+"); let each = r.values.iter().map(u64::to_string).collect::<Vec<_>>().join("+");
format!("{}: {}={}", r.spec, each, r.total) format!("{}: {}={}", r.spec, each, r.total)
} }
}
// ROLL rounds to a whole number; CALC keeps up to four decimals, trimmed. // ROLL rounds to a whole number; CALC keeps up to four decimals, trimmed.
fn format_value(v: f64, round_result: bool) -> String { fn format_value(v: f64, round_result: bool) -> String {