From c220702eef49d1762b91502f1dbf486e1fc81d0c Mon Sep 17 00:00:00 2001 From: David Gay Date: Sat, 14 Oct 2023 18:44:13 -0400 Subject: Improve class data loading --- src/main.rs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index e2c46ac..5f50fa7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,16 +1,10 @@ -use lazy_static::lazy_static; - use dmn::dice; use dmn::random_tables::RandomTables; -use dmn::rules::classes::Classes; +use dmn::rules::classes::CLASSES; use dmn::rules::npcs::Npc; mod cli; -lazy_static! { - static ref CLASSES: Classes = Classes::new().expect("Failed to load classes."); -} - fn main() { let matches = cli::cli().get_matches(); let random_tables = RandomTables::new().expect("Failed to load random tables."); @@ -21,13 +15,10 @@ fn main() { match random_command { ("henchman", _) => { let class_name = random_tables.roll_table("henchman_class").to_string(); - let class_ref = match CLASSES.class(&class_name) { - Ok(class_ref) => class_ref, - Err(err) => { - eprintln!("Error: {}", err); - std::process::exit(1); - } - }; + let class_ref = CLASSES.get(&*class_name).unwrap_or_else(|| { + eprintln!("Class '{}' not found.", &*class_name); + std::process::exit(1); + }); let npc = Npc::new( Some(random_tables.roll_table("npc_alignment")), Some(random_tables.roll_table("henchman_race")), -- cgit v1.2.3