using character and monster sheets

Cargo.lock

@@ -155,9 +155,9 @@ checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
 dependencies = [
  "either",
 ]
@@ -315,9 +315,9 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425"
+checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb"
 dependencies = [
  "bitflags 2.4.1",
  "cassowary",
@@ -326,6 +326,7 @@ dependencies = [
  "itertools",
  "lru",
  "paste",
+ "stability",
  "strum",
  "unicode-segmentation",
  "unicode-width",
@@ -388,6 +389,16 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
+[[package]]
+name = "stability"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "strum"
 version = "0.25.0"
@@ -407,7 +418,18 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -472,7 +494,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -494,7 +516,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -630,5 +652,5 @@ checksum = "56feebc4664bdb37f39c0b1b8fc8fa2f5648e3ec5f9cf4344978b4b7ca561fff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.38",
 ]

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ratatui = "0.24.0"
+ratatui = "0.25.0"
 crossterm = "0.27.0"
 rand = "0.8.5"
 petgraph = "0.6.4"

build.rs

@@ -0,0 +1,7 @@
+use std::process::Command;
+
+fn main() {
+    let output = Command::new("git").args(&["rev-parse", "--short",  "HEAD"]).output().unwrap();
+    let git_hash = String::from_utf8(output.stdout).unwrap();
+    println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+}

src/artifacts.rs

@@ -9,7 +9,7 @@ pub trait Artifact {
     /// get the position of the artifact in the level
     fn get_immutable_position(&self) -> &Position;
     /// call to apply the effects of the artifact to the player
-    fn collect(&mut self, player: &mut Player);
+    fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>);
     /// returns if the artifact was collected and can be removed from the level
     fn was_collected(&self) -> bool;
 }
@@ -37,8 +37,9 @@ impl Artifact for Chest {
     }
 
     fn get_immutable_position(&self) -> &Position { &self.position }
-    fn collect(&mut self, player: &mut Player) {
+    fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
         player.retrieve_gold(self.gold);
+        messages.insert(0, format!("opened chest and collected {} gold.", self.gold).to_string());
         self.gold = 0;
     }
 
@@ -67,9 +68,17 @@ impl Artifact for Potion {
         ("P", Color::Green)
     }
     fn get_immutable_position(&self) -> &Position { &self.position }
-    fn collect(&mut self, player: &mut Player) {
+    fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
+        // only consume potion of the player can gain at least one health point
+        if !player.is_healthy() {
+            let old = player.get_life();
             player.change_life(self.health.try_into().unwrap());
+            let new = player.get_life();
+            messages.insert(0, format!("picked up potion and gained {} hp.", new - old).to_string());
             self.health = 0;
+        } else {
+            messages.insert(0, "not using the potion because you're healthy.".to_string());
+        }
     }
 
     fn was_collected(&self) -> bool {

src/dungeon_slayer.rs

@@ -0,0 +1,138 @@
+use rand::Rng;
+
+pub fn do_challenge(stat: u8) -> bool {
+    if stat <= 20 {
+        let mut rng = rand::thread_rng();
+        let dice_roll = rng.gen_range(1..21);
+        return match dice_roll {
+            20 => { false }
+            1 => { true }
+            _ => dice_roll <= stat
+        };
+    }
+    true
+}
+
+pub struct PlayerStats {
+    // dungeon slayer attributes
+    pub(crate) body: u8,
+    pub(crate) agility: u8,
+    pub(crate) mind: u8,
+
+    // dungeon slayer properties
+    //  for body
+    pub(crate) strength: u8,
+    pub(crate) toughness: u8,
+    //  for agility
+    pub(crate) movement: u8,
+    pub(crate) dexterity: u8,
+    // for mind
+    pub(crate) wisdom: u8,
+    // TODO maybe the wrong translation of Verstand
+    pub(crate) aura: u8,
+}
+
+impl PlayerStats {
+    /// create random values for the 3 attributes of the dungeon slayer character
+    /// Each attribute is between 4 and 8, not over 20 in sum.
+    fn create_random_attributes() -> (u8, u8, u8) {
+        let mut values: [u8; 3] = [8, 8, 8];
+        let mut rng = rand::thread_rng();
+        while values[0] + values[1] + values[2] > 20 {
+            let i = rng.gen_range(0..3);
+            values[i] = values[i].saturating_sub(1);
+        }
+        (values[0], values[1], values[2])
+    }
+
+    /// create random values for the 6 properties of the dungeon slayer character
+    /// Each property is between 0 and 4, not over 8 in sum.
+    fn create_random_properties() -> (u8, u8, u8, u8, u8, u8) {
+        let mut values: [u8; 6] = [4, 4, 4, 4, 4, 4];
+        let mut rng = rand::thread_rng();
+        while values[0] + values[1] + values[2] + values[3] + values[4] + values[5] > 8 {
+            let i = rng.gen_range(0..6);
+            values[i] = values[i].saturating_sub(1);
+        }
+        (values[0], values[1], values[2], values[3], values[4], values[5])
+    }
+
+    /// create a set of player stats containing attributes and properties according to the
+    /// dungeon slayer rules.
+    pub fn create_random() -> PlayerStats {
+        let attributes = PlayerStats::create_random_attributes();
+        let properties = PlayerStats::create_random_properties();
+        PlayerStats {
+            body: attributes.0,
+            agility: attributes.1,
+            mind: attributes.2,
+            strength: properties.0,
+            toughness: properties.1,
+            movement: properties.2,
+            dexterity: properties.3,
+            wisdom: properties.4,
+            aura: properties.5,
+        }
+    }
+
+    /// calculate the max life based on this player stats.
+    pub fn get_max_life(&self) -> u8 {
+        self.body + self.toughness + 10
+    }
+    pub fn get_defense(&self) -> u8 {
+        self.body + self.toughness // TODO + self.armor
+    }
+}
+
+pub struct MonsterStats {
+    // dungeon slayer attributes
+    pub(crate) body: u8,
+    pub(crate) agility: u8,
+    pub(crate) mind: u8,
+
+    // dungeon slayer properties
+    //  for body
+    pub(crate) strength: u8,
+    pub(crate) toughness: u8,
+    //  for agility
+    pub(crate) movement: u8,
+    pub(crate) dexterity: u8,
+    // for mind
+    pub(crate) wisdom: u8,
+    // TODO maybe the wrong translation of Verstand
+    pub(crate) aura: u8,
+
+    pub(crate) max_life: u8,
+    pub(crate) defense: u8,
+    pub(crate) initiative: u8,
+    pub(crate) walk: u8,
+    pub(crate) hit: u8,
+    pub(crate) shoot: u8,
+    pub(crate) cast: u8,
+    pub(crate) targeted_cast: u8,
+}
+
+#[test]
+fn test_create_random_attributes() {
+    for _ in 0..1000 {
+        let attributes = PlayerStats::create_random_attributes();
+        assert!(attributes.0 <= 8);
+        assert!(attributes.1 <= 8);
+        assert!(attributes.2 <= 8);
+        assert_eq!(attributes.0 + attributes.1 + attributes.2, 20);
+    }
+}
+
+#[test]
+fn test_create_random_properties() {
+    for _ in 0..1000 {
+        let properties = PlayerStats::create_random_properties();
+        assert!(properties.0 <= 4);
+        assert!(properties.1 <= 4);
+        assert!(properties.2 <= 4);
+        assert!(properties.3 <= 4);
+        assert!(properties.4 <= 4);
+        assert!(properties.5 <= 4);
+        assert_eq!(properties.0 + properties.1 + properties.2 + properties.3 + properties.4 + properties.5, 8);
+    }
+}

src/game.rs

@@ -1,3 +1,4 @@
+use crate::dungeon_slayer::PlayerStats;
 use crate::level::{Level, StructureElement};
 use crate::level_generator::LevelGenerator;
 use crate::player::Player;
@@ -23,6 +24,7 @@ pub struct Game {
     player: Player,
     /// the levels of the game
     levels: Vec<Level>,
+    pub messages: Vec<String>,
 }
 
 impl Game {
@@ -34,6 +36,7 @@ impl Game {
         let mut g = Game {
             player: p,
             levels: v,
+            messages: Vec::with_capacity(10),
         };
         let start = {
             g.get_level(0).start
@@ -125,12 +128,14 @@ impl Game {
                         (dx, dy) = (0, 0);
                         let (next_level, x, y) = self.next_start();
                         player_level = next_level;
+                        self.messages.insert(0, format!("you climb down to level {}.", next_level));
                         self.get_mutable_player().get_position().set(next_level, x, y);
                     }
                     StructureElement::StairUp => {
                         (dx, dy) = (0, 0);
                         let (next_level, x, y) = self.prev_end();
                         player_level = next_level;
+                        self.messages.insert(0, format!("you climb up to level {}.", next_level));
                         self.get_mutable_player().get_position().set(next_level, x, y);
                     }
                     _ => {}
@@ -155,6 +160,8 @@ impl Game {
                 // TODO fight the monster
                 self.player.change_life(-1);
                 m.decrease_life(1);
+                self.messages.insert(0, format!("{} hits you.", m.get_name()).to_string());
+                self.messages.insert(0, format!("you hit {}.", m.get_name()).to_string());
                 // monster died, player gains experience
                 if m.is_dead() {
                     self.player.gain_experience(m.get_experience_gain());
@@ -172,7 +179,7 @@ impl Game {
         match a {
             None => {}
             Some(a) => {
-                a.collect(&mut self.player);
+                a.collect(&mut self.player, &mut self.messages);
             }
         }
     }
@@ -181,20 +188,42 @@ impl Game {
         let player_pos = &self.player.get_immutable_position();
         let player_level = player_pos.get_level();
         let level = &mut self.levels[player_level];
-        level.update(ticks, &mut self.player);
+        level.update(ticks, &mut self.player, &mut self.messages);
     }
 }
 
 #[test]
 fn game_has_correct_number_of_levels() {
-    let p = Player::new("foo", 42);
+    let player_stats = PlayerStats {
+        body: 8,
+        agility: 8,
+        mind: 4,
+        strength: 3,
+        toughness: 3,
+        movement: 1,
+        dexterity: 1,
+        wisdom: 0,
+        aura: 0,
+    };
+    let p = Player::new("foo", player_stats);
     let g = Game::new(p);
     assert_eq!(g.levels.len(), LEVELS);
 }
 
 #[test]
 fn game_has_player() {
-    let p = Player::new("foo", 42);
+    let player_stats = PlayerStats {
+        body: 8,
+        agility: 8,
+        mind: 4,
+        strength: 3,
+        toughness: 3,
+        movement: 1,
+        dexterity: 1,
+        wisdom: 0,
+        aura: 0,
+    };
+    let p = Player::new("foo", player_stats);
     let g = Game::new(p);
     assert_eq!(g.get_player().get_name(), "foo");
     assert_eq!(g.get_player().get_immutable_position().get_level(), 0);
@@ -202,16 +231,38 @@ fn game_has_player() {
 
 #[test]
 fn game_has_mutable_player() {
-    let p = Player::new("foo", 42);
+    let player_stats = PlayerStats {
+        body: 8,
+        agility: 8,
+        mind: 4,
+        strength: 3,
+        toughness: 3,
+        movement: 1,
+        dexterity: 1,
+        wisdom: 0,
+        aura: 0,
+    };
+    let p = Player::new("foo", player_stats);
     let mut g = Game::new(p);
     assert_eq!(g.get_player().get_name(), "foo");
     g.get_mutable_player().change_life(-1);
-    assert_eq!(g.get_player().get_life(), 41);
+    assert_eq!(g.get_player().get_life(), 20);
 }
 
 #[test]
 fn game_get_level() {
-    let p = Player::new("foo", 42);
+    let player_stats = PlayerStats {
+        body: 8,
+        agility: 8,
+        mind: 4,
+        strength: 3,
+        toughness: 3,
+        movement: 1,
+        dexterity: 1,
+        wisdom: 0,
+        aura: 0,
+    };
+    let p = Player::new("foo", player_stats);
     let mut g = Game::new(p);
     g.get_level(0);
     assert_ne!(g.get_level(0).start, (0, 0));

src/level.rs

@@ -112,7 +112,7 @@ impl Level {
             }
         }
     }
-    pub fn update(&mut self, ticks: u128, player: &mut Player) {
+    pub fn update(&mut self, ticks: u128, player: &mut Player, messages: &mut Vec<String>) {
         for (index, a) in &mut self.artifacts.iter().enumerate() {
             if a.was_collected() {
                 self.artifacts.remove(index);
@@ -140,6 +140,8 @@ impl Level {
                     if player.get_immutable_position().get_x() == new_x && player.get_immutable_position().get_y() == new_y {
                         self.monsters[index].decrease_life(1);
                         player.change_life(-1);
+                        messages.insert(0, format!("{} hits you.", self.monsters[index].get_name()).to_string());
+                        messages.insert(0, format!("you hit {}.", self.monsters[index].get_name()).to_string());
                         // if the attack did not kill the opponent, back down
                         if !player.is_dead() {
                             self.monsters[index].get_position().change(-dx, -dy);
@@ -162,6 +164,7 @@ impl Level {
         let new_x: usize = (agent_pos.get_x() as i16 + dx) as usize;
         let new_y: usize = (agent_pos.get_y() as i16 + dy) as usize;
 
+        // verify we cannot leave the playing field
         if new_x >= LEVEL_WIDTH || new_y >= LEVEL_HEIGHT {
             return false;
         }
@@ -176,6 +179,12 @@ impl Level {
         let agent_pos = agent.get_immutable_position();
         let new_x: usize = (agent_pos.get_x() as i16 + dx) as usize;
         let new_y: usize = (agent_pos.get_y() as i16 + dy) as usize;
+
+        // verify we cannot leave the playing field
+        if new_x >= LEVEL_WIDTH || new_y >= LEVEL_HEIGHT {
+            return false;
+        }
+
         self.structure[new_x][new_y] != StructureElement::Wall
     }
     #[cfg(test)]
@@ -295,9 +304,9 @@ fn test_discover_get_monster() {
     assert_eq!(elem.0.unwrap(), StructureElement::Floor);
     assert!(elem.1.is_some());
     let m = elem.1.unwrap();
-    assert_eq!(m.get_life(), 2);
+    assert_eq!(m.get_life(), 3);
 
-    m.decrease_life(2);
+    m.decrease_life(3);
     assert_eq!(l.get_element(10, 10).1.unwrap().get_life(), 0);
 }
 
@@ -333,5 +342,5 @@ fn test_discover_get_monster_can_move() {
     assert!(m.is_none());
     let m = l.get_element(11, 11).1;
     assert!(m.is_some());
-    assert_eq!(m.unwrap().get_life(), 2);
+    assert_eq!(m.unwrap().get_life(), 3);
 }

src/main.rs

@@ -8,7 +8,7 @@ use crossterm::{
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use ratatui::{
-    prelude::{CrosstermBackend, Stylize, Terminal},
+    prelude::{CrosstermBackend, Terminal},
     widgets::Paragraph,
 };
 use ratatui::prelude::*;
@@ -16,9 +16,9 @@ use ratatui::widgets::{Block, Borders, BorderType, Wrap};
 use ratatui::widgets::block::{Position, Title};
 use whoami::realname;
 
+use crate::dungeon_slayer::PlayerStats;
 use crate::game::{Game, GameState};
 use crate::level_widget::LevelWidget;
-// use crate::level_widget::LevelWidget;
 use crate::player::Player;
 use crate::position::HasPosition;
 
@@ -30,13 +30,15 @@ mod level_widget;
 mod level_generator;
 mod artifacts;
 mod monster;
+mod dungeon_slayer;
 
 /// length of a game frame in ms
 pub const FRAME_LENGTH: u64 = 100;
 
 //
 fn main() -> Result<()> {
-    let mut game = Game::new(Player::new(realname().as_str(), 10));
+    let player_stats = PlayerStats::create_random();
+    let mut game = Game::new(Player::new(realname().as_str(), player_stats));
 
     stdout().execute(EnterAlternateScreen)?;
     enable_raw_mode()?;
@@ -87,23 +89,54 @@ fn main() -> Result<()> {
                 x: area.x + 50,
                 y: area.y,
                 width: 30,
-                height: 25,
+                height: 15,
             };
+            let block = Block::default()
+                .title(
+                    Title::from(
+                        format!(" {} ", game.get_player().get_name()))
+                        .alignment(Alignment::Center)
+                        .position(Position::Top)
+                )
+                .borders(Borders::TOP)
+                .border_style(Style::default().fg(Color::White))
+                .border_type(BorderType::Rounded)
+                .style(Style::default().bg(Color::Blue));
             frame.render_widget(
-                Paragraph::new(format!("{}\nHealth: {}/{}\nExp: {}\nGold: {}\nLevel: {}",
+                Paragraph::new(format!("Health: {}/{}\nExp: {}\nGold: {}\nLevel: {}",
-                                       game.get_player().get_name(),
                                        game.get_player().get_life(),
                                        game.get_player().get_max_life(),
                                        game.get_player().get_experience(),
                                        game.get_player().get_gold(),
                                        game.get_player().get_immutable_position().get_level()))
-                    .white()
+                    .block(block).wrap(Wrap { trim: true }),
-                    .on_blue(),
                 stats_area,
             );
+            let messages_area = Rect {
+                x: area.x + 50,
+                y: area.y + 15,
+                width: 30,
+                height: 10,
+            };
+            // Display the latest messages from the game to the user
+            let block = Block::default()
+                .title(Title::from(" messages ").alignment(Alignment::Center).position(Position::Top))
+                .borders(Borders::TOP)
+                .border_style(Style::default().fg(Color::White))
+                .border_type(BorderType::Rounded)
+                .style(Style::default().bg(Color::Blue));
+
+            let paragraph1 = if game.messages.is_empty() { "".to_string() } else { format!("> {}", game.messages.join("\n> ")) };
+            frame.render_widget(
+                Paragraph::new(paragraph1).block(block).wrap(Wrap { trim: true }),
+                messages_area,
+            );
         })?;
         if event::poll(std::time::Duration::from_millis(FRAME_LENGTH))? {
             if let event::Event::Key(key) = event::read()? {
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('v') {
+                    game.messages.insert(0, format!("You are playing version '{}'.", env!("GIT_HASH")).to_string());
+                }
                 if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
                     break;
                 }
@@ -140,7 +173,7 @@ fn main() -> Result<()> {
             area.width = 40;
             area.height = 20;
             let block = Block::default()
-                .title("Game ended")
+                .title(Title::from(" Game ended ").alignment(Alignment::Center).position(Position::Top))
                 .title(Title::from("Press `q` to quit!").position(Position::Bottom))
                 .borders(Borders::ALL)
                 .border_style(Style::default().fg(Color::White))
@@ -171,7 +204,6 @@ fn main() -> Result<()> {
             }
         }
     }
-
     stdout().execute(LeaveAlternateScreen)?;
     disable_raw_mode()?;
     Ok(())

src/monster.rs

@@ -1,8 +1,10 @@
 use ratatui::prelude::Color;
 
+use crate::dungeon_slayer::MonsterStats;
 use crate::position::{HasPosition, Position};
 
 pub trait Monster: HasPosition {
+    fn get_name(&self) -> &str;
     fn is_dead(&self) -> bool;
     fn get_representation(&self) -> (&str, Color);
     fn decrease_life(&mut self, by: usize);
@@ -16,6 +18,7 @@ pub trait Monster: HasPosition {
 macro_rules! default_monster {
     ($($t:ty),+ $(,)?) => ($(
         impl Monster for $t {
+            fn get_name(&self) -> &str { &self.name }
             fn is_dead(&self) -> bool { self.life <= 0 }
             fn get_experience_gain(&self) -> usize { self.experience_gain }
             fn get_representation(&self) -> (&str, Color) { (&self.symbol, self.color) }
@@ -39,46 +42,92 @@ macro_rules! default_monster {
 }
 
 pub struct Rat {
+    name: String,
     life: usize,
     position: Position,
     symbol: String,
     color: Color,
     experience_gain: usize,
     ticks_between_steps: u128,
+    monster_stats: MonsterStats,
 }
 
 impl Rat {
     pub fn new_with_position(position: Position) -> Self {
+        let monster_stats = MonsterStats {
+            body: 2,
+            agility: 4,
+            mind: 1,
+            strength: 1,
+            toughness: 0,
+            movement: 2,
+            dexterity: 0,
+            wisdom: 0,
+            aura: 0,
+            max_life: 3,
+            defense: 2,
+            initiative: 6,
+            walk: 3,
+            hit: 4,
+            shoot: 0,
+            cast: 0,
+            targeted_cast: 0,
+        };
         Self {
-            life: 2,
+            name: "rat".to_string(),
+            life: 3,
             position,
             symbol: String::from("R"),
             color: Color::Black,
             experience_gain: 5,
             ticks_between_steps: 5,
+            monster_stats,
         }
     }
 }
 default_monster!(Rat);
 
 pub struct Orc {
+    name: String,
     life: usize,
     position: Position,
     symbol: String,
     color: Color,
     experience_gain: usize,
     ticks_between_steps: u128,
+    monster_stats: MonsterStats,
 }
 
 impl Orc {
     pub fn new_with_position(position: Position) -> Self {
+        let monster_stats = MonsterStats {
+            body: 10,
+            agility: 6,
+            mind: 2,
+            strength: 2,
+            toughness: 3,
+            movement: 0,
+            dexterity: 3,
+            wisdom: 1,
+            aura: 0,
+            max_life: 23,
+            defense: 14,
+            initiative: 1,
+            walk: 4,
+            hit: 13,
+            shoot: 10,
+            cast: 0,
+            targeted_cast: 0,
+        };
         Self {
-            life: 4,
+            name: "orc".to_string(),
+            life: 23,
             position,
             symbol: String::from("O"),
             color: Color::DarkGray,
             experience_gain: 10,
             ticks_between_steps: 10,
+            monster_stats
         }
     }
 }
@@ -102,11 +151,17 @@ fn monsters_can_move() {
 #[test]
 fn monsters_can_die() {
     let mut m = Rat::new_with_position(Position::new(0, 0, 0));
-    assert_eq!(m.get_life(), 2);
+    assert_eq!(m.get_life(), 3);
     assert_eq!(m.is_dead(), false);
     m.decrease_life(1);
-    assert_eq!(m.get_life(), 1);
+    assert_eq!(m.get_life(), 2);
-    m.decrease_life(2);
+    m.decrease_life(3);
     assert_eq!(m.get_life(), 0);
     assert_eq!(m.is_dead(), true);
 }
+
+#[test]
+fn test_rat_values() {
+    let mut m = Rat::new_with_position(Position::new(0, 0, 0));
+    assert_eq!(m.monster_stats.max_life, 3);
+}

src/player.rs

@@ -1,40 +1,43 @@
 use std::cmp::{max, min};
 
+use crate::dungeon_slayer::PlayerStats;
 use crate::position::{HasPosition, Position};
 
 pub struct Player {
     name: String,
     position: Position,
     life: i16,
-    max_life: i16,
     gold: usize,
     experience: usize,
+    pub(crate) player_stats: PlayerStats,
 }
 
 impl Player {
-    pub fn new(name: &str, max_life: i16) -> Player {
+    pub fn new(name: &str, player_stats: PlayerStats) -> Player {
         Player {
             name: name.to_string(),
             position: Position::new(0, 0, 0),
-            life: max_life,
+            life: player_stats.get_max_life() as i16,
-            max_life,
             gold: 0,
             experience: 0,
+            player_stats,
         }
     }
     pub fn get_name(&self) -> String {
         return self.name.clone();
     }
     pub fn change_life(&mut self, by: i16) {
-        self.life = max(0, min(self.max_life, self.life + by));
+        self.life = max(0, min(self.get_max_life(), self.life + by));
     }
-    /// returns true if the player is dead (life <= 0)
     pub fn get_life(&self) -> i16 {
         self.life
     }
+    /// returns true if the player is dead (life <= 0)
     pub fn is_dead(&self) -> bool { self.life <= 0 }
+    /// returns true if the player's life is at maximum
+    pub fn is_healthy(&self) -> bool { self.life == self.get_max_life() }
     pub fn get_max_life(&self) -> i16 {
-        self.max_life
+        self.player_stats.get_max_life() as i16
     }
 
     /// add the given amount to the players gold stash
@@ -63,16 +66,37 @@ fn test_get_name() {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
         life: 5,
-        max_life: 10,
         gold: 0,
         experience: 0,
+        player_stats: PlayerStats {
+            body: 0,
+            agility: 0,
+            mind: 0,
+            strength: 0,
+            toughness: 0,
+            movement: 0,
+            dexterity: 0,
+            wisdom: 0,
+            aura: 0,
+        },
     };
     assert_eq!(p.get_name(), "Teddy Tester");
 }
 
 #[test]
 fn test_can_receive_gold() {
-    let mut p = Player::new("Teddy Tester", 10);
+    let player_stats = PlayerStats {
+        body: 8,
+        agility: 8,
+        mind: 4,
+        strength: 3,
+        toughness: 3,
+        movement: 1,
+        dexterity: 1,
+        wisdom: 0,
+        aura: 0,
+    };
+    let mut p = Player::new("Teddy Tester", player_stats);
     assert_eq!(p.get_gold(), 0);
 
     p.retrieve_gold(13);
@@ -86,9 +110,19 @@ fn test_change_life() {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
         life: 5,
-        max_life: 10,
         gold: 0,
         experience: 0,
+        player_stats: PlayerStats {
+            body: 0,
+            agility: 0,
+            mind: 0,
+            strength: 0,
+            toughness: 0,
+            movement: 0,
+            dexterity: 0,
+            wisdom: 0,
+            aura: 0,
+        },
     };
     assert_eq!(p.get_life(), 5);
     p.change_life(-2);
@@ -101,7 +135,18 @@ fn test_change_life() {
 
 #[test]
 fn player_can_move() {
-    let mut p = Player::new("Teddy Tester", 10);
+    let player_stats = PlayerStats {
+        body: 8,
+        agility: 8,
+        mind: 4,
+        strength: 3,
+        toughness: 3,
+        movement: 1,
+        dexterity: 1,
+        wisdom: 0,
+        aura: 0,
+    };
+    let mut p = Player::new("Teddy Tester", player_stats);
     assert_eq!(p.get_position(), &Position::new(0, 0, 0));
     p.get_position().change(1, 2);
     assert_eq!(p.get_position(), &Position::new(0, 1, 2));
@@ -119,9 +164,19 @@ fn test_max_life() {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
         life: 5,
-        max_life: 10,
         gold: 0,
         experience: 0,
+        player_stats: PlayerStats {
+            body: 0,
+            agility: 0,
+            mind: 0,
+            strength: 0,
+            toughness: 0,
+            movement: 0,
+            dexterity: 0,
+            wisdom: 0,
+            aura: 0,
+        },
     };
     assert_eq!(p.get_max_life(), 10);
 }