From 1799b91efa0e81c1f893d94851388820a458e113 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 13 Jul 2024 14:54:33 +0200 Subject: add sushi bar and more recipes --- server/src/data.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'server/src') diff --git a/server/src/data.rs b/server/src/data.rs index 966fd0d2..24e8e232 100644 --- a/server/src/data.rs +++ b/server/src/data.rs @@ -192,17 +192,21 @@ impl Gamedata { match r.action { Action::Never => {} Action::Passive => recipes.push(Recipe::Passive { - duration: r.duration.expect("duration for passive missing"), + duration: r.duration.ok_or(anyhow!("duration for passive missing"))?, warn: r.warn, tile, revert_duration: r.revert_duration, - input: inputs.next().expect("passive recipe without input"), + input: inputs + .next() + .ok_or(anyhow!("passive recipe without input"))?, output: outputs.next(), }), Action::Active => recipes.push(Recipe::Active { - duration: r.duration.expect("duration for active missing"), + duration: r.duration.ok_or(anyhow!("duration for active missing"))?, tile, - input: inputs.next().expect("active recipe without input"), + input: inputs + .next() + .ok_or(anyhow!("active recipe without input"))?, outputs: [outputs.next(), outputs.next()], }), Action::Instant => { -- cgit v1.2.3-70-g09d2