add character creation; add Race and Class types to Player

src/cli/mod.rs

@@ -11,7 +11,7 @@ use crate::{
     entity::{Element, Enemy, Entity, Item},
     input::{read_line, CmdTokens, Lexer, Parser},
     player::Player,
-    types::{Action, CmdResult},
+    types::{Action, Class, CmdResult, Race},
     world::World,
 };
 
@@ -109,8 +109,11 @@ Some available commands:
 
     /// Start a typical game for the command line
     pub fn start(&self) {
+        if !self.running.get() {
+            self.create_character();
+        }
+
         println!("Type \"help\" if you are unfamiliar with text-based games.\n");
-        println!("Use \"increase\" to use your initial stat points.\n");
         println!("{}", self.ask("l"));
 
         self.running.set(true);
@@ -119,6 +122,26 @@ Some available commands:
         }
     }
 
+    pub fn create_character(&self) {
+        self.player
+            .borrow_mut()
+            .set_race(Race::select_race(&self.prompt(
+                "Choose a race:\n  \
+                            1) Human (default)\n  \
+                            2) Dwarf\n  \
+                            3) Elf\n\n",
+            )));
+
+        self.player
+            .borrow_mut()
+            .set_class(Class::select_class(&self.prompt(
+                "Choose a class:\n  \
+                            1) Fighter (default)\n  \
+                            2) Rogue\n  \
+                            3) Wizard\n\n",
+            )));
+    }
+
     /// Handle user input and return the results of commands and events
     pub fn ask(&self, input: &str) -> String {
         let command = Lexer::lex(input);

src/player/mod.rs

@@ -9,15 +9,17 @@ use crate::{
         Item::{self, Armor, Weapon},
     },
     inventory::Inventory,
-    types::{Action, CmdResult, CombatStatus, Items, Stats},
+    types::{Action, Class, CmdResult, CombatStatus, Items, Race, Stats},
 };
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Player {
+    lvl: u32,
+    race: Race,
+    class: Class,
     hp: (i32, u32),
     xp: (u32, u32),
     in_combat: CombatStatus,
-    lvl: u32,
     stats: Stats,
     main_hand: Option<Box<Item>>,
     armor: Option<Box<Item>>,
@@ -27,10 +29,12 @@ pub struct Player {
 impl Default for Player {
     fn default() -> Self {
         Self {
+            lvl: 1,
+            race: Race::Human,
+            class: Class::Fighter,
             hp: (13, 13),
             xp: (0, 1000),
             in_combat: CombatStatus::Resting,
-            lvl: 1,
             stats: Stats::new(),
             main_hand: None,
             armor: None,
@@ -40,6 +44,14 @@ impl Default for Player {
 }
 
 impl Player {
+    pub fn set_race(&mut self, race: Race) {
+        self.race = race;
+    }
+
+    pub fn set_class(&mut self, class: Class) {
+        self.class = class;
+    }
+
     fn deal_damage(&self, weapon_damage: u32) -> u32 {
         (weapon_damage as i32 + self.stats.strngth_mod()) as u32
     }
@@ -192,12 +204,14 @@ impl Player {
         CmdResult::new(
             Action::Passive,
             format!(
-                "Level: {}\
+                "Level {} {} {}\
                  \nHP: ({} / {})\
                  \nAC: {}\
                  \nXP: ({} / {})\
                  \n{}",
                 self.lvl,
+                self.race.to_string(),
+                self.class.to_string(),
                 self.hp(),
                 self.hp_cap(),
                 self.ac(),

src/types/class.rs

@@ -0,0 +1,26 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum Class {
+    Fighter,
+    Wizard,
+    Rogue,
+}
+
+impl Class {
+    pub fn to_string(&self) -> String {
+        match self {
+            Self::Fighter => "Fighter".to_string(),
+            Self::Wizard => "Wizard".to_string(),
+            Self::Rogue => "Rogue".to_string(),
+        }
+    }
+
+    pub fn select_class(input: &str) -> Self {
+        match input.chars().next() {
+            Some('2') => Class::Rogue,
+            Some('3') => Class::Wizard,
+            _ => Class::Fighter,
+        }
+    }
+}

src/types/mod.rs

@@ -1,9 +1,13 @@
 mod aliases;
+mod class;
+mod race;
 mod results;
 mod stats;
 mod status;
 
 pub use aliases::{Allies, Elements, Enemies, Items, Paths, Rooms};
+pub use class::Class;
+pub use race::Race;
 pub use results::{Action, CmdResult};
 pub use stats::Stats;
 pub use status::{CombatStatus, EnemyStatus};

src/types/race.rs

@@ -0,0 +1,26 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum Race {
+    Human,
+    Dwarf,
+    Elf,
+}
+
+impl Race {
+    pub fn to_string(&self) -> String {
+        match self {
+            Self::Human => "Human".to_string(),
+            Self::Dwarf => "Dwarf".to_string(),
+            Self::Elf => "Elf".to_string(),
+        }
+    }
+
+    pub fn select_race(input: &str) -> Self {
+        match input.chars().next() {
+            Some('2') => Race::Dwarf,
+            Some('3') => Race::Elf,
+            _ => Race::Human,
+        }
+    }
+}