Partial implementation of Class struct

3 files changed, 50 insertions, 5 deletions

diff --git a/src/rules/ability_scores.rs b/src/rules/ability_scores.rs
index f255d4f..205c1a3 100644
--- a/src/rules/ability_scores.rs
+++ b/src/rules/ability_scores.rs
@@ -37,7 +37,10 @@ impl AbilityScoreCollection {
     }
 
     pub fn add_score(&mut self, ability_score: AbilityScore, bonus: u32) {
-        self.scores.entry(ability_score).or_insert_with(Vec::new).push(bonus);
+        self.scores
+            .entry(ability_score)
+            .or_insert_with(Vec::new)
+            .push(bonus);
     }
 
     pub fn get_score(&self, ability_score: AbilityScore) -> Option<&Vec<u32>> {
diff --git a/src/rules/classes.rs b/src/rules/classes.rs
index 5cd29d6..cc827f0 100644
--- a/src/rules/classes.rs
+++ b/src/rules/classes.rs
@@ -3,6 +3,7 @@ use serde::Deserialize;
 use serde_yaml;
 use std::collections::HashMap;
 use std::error::Error;
+// use std::fmt;
 use std::string::String;
 
 #[derive(Deserialize)]
@@ -31,7 +32,13 @@ impl Classes {
         Ok(Classes { classes })
     }
 
-    pub fn class(&self, class_name: &str) -> Option<&Class> {
-        self.classes.get(class_name)
+    pub fn class(&self, class_name: &str) -> Result<&Class, &'static str> {
+        self.classes.get(class_name).ok_or("Class not found.")
     }
 }
+//
+// impl fmt::Display for Class {
+//     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+//         write!(f, "{}", self.name)
+//     }
+// }
diff --git a/src/rules/npcs.rs b/src/rules/npcs.rs
index 67eeb47..c3fc86a 100644
--- a/src/rules/npcs.rs
+++ b/src/rules/npcs.rs
@@ -1,7 +1,42 @@
 use crate::rules::ability_scores::AbilityScoreCollection;
 use crate::rules::classes::Class;
+// use std::fmt;
 
 pub struct Npc {
-    pub class: Class,
-    pub ability_score_collection: AbilityScoreCollection,
+    pub alignment: Option<String>,
+    pub race: Option<String>,
+    pub class: Option<&'static Class>,
+    pub ability_scores: Option<AbilityScoreCollection>,
 }
+
+impl Npc {
+    pub fn new(
+        alignment: Option<String>,
+        race: Option<String>,
+        class: Option<&'static Class>,
+        ability_scores: Option<AbilityScoreCollection>,
+    ) -> Self {
+        Npc {
+            alignment,
+            race,
+            class,
+            ability_scores,
+        }
+    }
+}
+
+// impl fmt::Display for Npc {
+//     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+//         let values: Vec<&str> = vec![
+//             self.alignment.as_deref().unwrap_or(""),
+//             self.race.as_deref().unwrap_or(""),
+//             self.class.as_ref().map_or("", |class| &class.name),
+//         ]
+//         .into_iter()
+//         .filter(|&s| !s.is_empty())
+//         .collect();
+//
+//         let formatted_string = values.join(" ");
+//         write!(f, "{}", formatted_string)
+//     }
+// }