monsters can be attack but do not die

fixing imports and stuff

.idea/el_diabolo.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="EMPTY_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

Cargo.lock

@@ -164,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -453,9 +453,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -463,9 +463,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
 dependencies = [
  "bumpalo",
  "log",
@@ -478,9 +478,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -488,9 +488,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -501,15 +501,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
 name = "web-sys"
-version = "0.3.66"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

src/artifacts.rs

@@ -1,76 +0,0 @@
-use ratatui::style::Color;
-
-use crate::player::Player;
-use crate::position::Position;
-
-pub trait Artifact {
-    //! An artifact that can be collected by the player
-    fn get_representation(&self) -> (&str, Color);
-    /// 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);
-    /// returns if the artifact was collected and can be removed from the level
-    fn was_collected(&self) -> bool;
-}
-
-pub struct Chest {
-    /// a chest that contains some gold
-    position: Position,
-    gold: usize,
-}
-
-impl Chest {
-    pub fn new(position: Position) -> Self {
-        Self {
-            position,
-            gold: 10,
-        }
-    }
-}
-
-impl Artifact for Chest {
-    fn get_representation(&self) -> (&str, Color) {
-        ("C", Color::Blue)
-    }
-
-    fn get_immutable_position(&self) -> &Position { &self.position }
-    fn collect(&mut self, player: &mut Player) {
-        player.retrieve_gold(self.gold);
-        self.gold = 0;
-    }
-
-    fn was_collected(&self) -> bool {
-        self.gold == 0
-    }
-}
-
-pub struct Potion {
-    /// a potion that restores some health
-    position: Position,
-    health: usize,
-}
-
-impl Potion {
-    pub fn new(position: Position) -> Self {
-        Self {
-            position,
-            health: 5,
-        }
-    }
-}
-
-impl Artifact for Potion {
-    fn get_representation(&self) -> (&str, Color) {
-        ("P", Color::Green)
-    }
-    fn get_immutable_position(&self) -> &Position { &self.position }
-    fn collect(&mut self, player: &mut Player) {
-        player.change_life(self.health.try_into().unwrap());
-        self.health = 0;
-    }
-
-    fn was_collected(&self) -> bool {
-        self.health == 0
-    }
-}

src/game.rs

@@ -1,191 +1,66 @@
-use crate::level::{Level, StructureElement};
+use crate::level::{Artifact, Level, StructureElement};
-use crate::level_generator::LevelGenerator;
 use crate::player::Player;
-use crate::position::Position;
 
-pub const LEVELS: usize = 2;
-
-/// the main structure to hold all information about the ongoing game
 pub struct Game {
-    /// the player
+    pub player: Player,
-    player: Player,
+    pub levels: [Level; 25],
-    /// the levels of the game
-    levels: Vec<Level>,
 }
 
 impl Game {
-    pub fn new(p: Player) -> Game {
+    pub fn move_player(&mut self, dx: i16, dy: i16) {
-        let mut v: Vec<Level> = Vec::with_capacity(LEVELS);
+        // check if move is allowed first
-        for d in 0..LEVELS {
+        let player_pos = self.player.get_position();
-            v.push(LevelGenerator::generate(d, d == 0, d == LEVELS - 1).render());
+        let level = &self.levels[player_pos.get_level()];
-        }
-        let mut g = Game {
-            player: p,
-            levels: v,
-        };
-        let start = {
-            g.get_level(0).start
-        };
-        g.get_mutable_player().get_position().set(0, start.0, start.1);
-        g.get_mutable_level(0).discover(&Position::new(0, start.0, start.1));
-        g
-    }
-
-    pub fn get_player(&self) -> &Player {
-        &self.player
-    }
-    pub fn get_mutable_player(&mut self) -> &mut Player {
-        &mut self.player
-    }
-    pub fn get_level(&self, level: usize) -> &Level { &self.levels[level] }
-    pub fn get_mutable_level(&mut self, level: usize) -> &mut Level { &mut self.levels[level] }
-    /// check if the player can move in the given direction. This only checks for structure element
-    /// limitation as walls.
-    fn can_move(&mut self, dx: i16, dy: i16) -> bool {
-        let player_pos = &self.player.get_position();
         let new_x: i16 = player_pos.get_x() as i16 + dx;
         let new_y: i16 = player_pos.get_y() as i16 + dy;
-        let level = &mut self.levels[player_pos.get_level()];
+        let can_go: bool = match level.get_element(new_x, new_y) {
-        match level.get_element(new_x, new_y) {
+            (None, _, _) => { false }
-            (None, _, _) => { return false; }
+            (_, _, Some(e)) => {
+                self.levels[player_pos.get_level()].attack(new_x, new_y, &mut self.player)
+            }
             (Some(t), _, _) => {
                 match t {
-                    StructureElement::Wall => { return false; }
+                    StructureElement::Wall => { false }
-                    _ => {}
+                    _ => { true }
                 }
             }
         };
-        true
+        if can_go {
-    }
+            let tmp = level.get_element(new_x, new_y);
-    /// returns the position (as tuple) of the next level's start point.
+            match tmp.0.unwrap() {
-    fn next_start(&self) -> (usize, usize, usize) {
-        let level = self.player.get_immutable_position().get_level() + 1;
-        let (x, y) = self.levels[level].start;
-        (level, x, y)
-    }
-    /// returns the position (as tuple) of the previous level's end point.
-    fn prev_end(&self) -> (usize, usize, usize) {
-        let level = self.player.get_immutable_position().get_level() - 1;
-        let (x, y) = self.levels[level].end;
-        (level, x, y)
-    }
-    /// get the next structure element sen from the player's position into the given direction.
-    fn next_element(&mut self, dx: i16, dy: i16) -> Option<StructureElement> {
-        let player_pos = &self.player.get_position();
-        let new_x: i16 = player_pos.get_x() as i16 + dx;
-        let new_y: i16 = player_pos.get_y() as i16 + dy;
-        let player_level = player_pos.get_level();
-        let level = &mut self.levels[player_level];
-        level.get_element(new_x, new_y).0
-    }
-
-    /// move the game's player into the given direction. If on the target field there is a stair,
-    /// the player follows the stair up/down to the next level.
-    /// Discovery is performed on the new location of the player.
-    /// The returned value is the direction that will bring the player back to his original field.
-    pub fn move_player(&mut self, mut dx: i16, mut dy: i16) -> (i16, i16) {
-        // verify the player can do the move
-        if !self.can_move(dx, dy) {
-            return (-dx, -dy);
-        }
-
-        let player_pos = &self.player.get_position();
-        let mut player_level = player_pos.get_level();
-        let structure = self.next_element(dx, dy);
-
-        // use stairs if walked onto one
-        match structure {
-            Some(e) => {
-                match e {
                 StructureElement::StairDown => {
-                        (dx, dy) = (0, 0);
+                    let next_level = player_pos.get_level() + 1;
-                        let (next_level, x, y) = self.next_start();
+                    let start_x: usize = self.levels[next_level].start_x;
-                        player_level = next_level;
+                    let start_y: usize = self.levels[next_level].start_y;
-                        self.get_mutable_player().get_position().set(next_level, x, y);
+                    self.player.set_position(next_level, start_x, start_y);
+                    self.levels[next_level].discover(self.player.get_position());
                 }
                 StructureElement::StairUp => {
-                        (dx, dy) = (0, 0);
+                    self.player.set_position(
-                        let (next_level, x, y) = self.prev_end();
+                        player_pos.get_level() - 1,
-                        player_level = next_level;
+                        self.levels[player_pos.get_level() - 1].end_x,
-                        self.get_mutable_player().get_position().set(next_level, x, y);
+                        self.levels[player_pos.get_level() - 1].end_y,
+                    );
                 }
-                    _ => {}
+                _ => {
-                }
+                    self.player.change_position(dx, dy);
-            }
+                    self.levels[player_pos.get_level()].discover(self.player.get_position());
-            _ => {}
-        }
-
-        // update position and discover area on new position
-        let (new_x, new_y) = self.get_mutable_player().get_position().change(dx, dy);
-        self.get_mutable_level(player_level).discover(&Position::new(player_level, new_x, new_y));
-        (-dx, -dy)
-    }
-    pub fn player_fights_monster(&mut self) -> bool {
-        let player_pos = &self.player.get_immutable_position();
-        let player_level = player_pos.get_level();
-        let level = &mut self.levels[player_level];
-        let (_, m, _) = level.get_element(player_pos.get_x() as i16, player_pos.get_y() as i16);
-        match m {
-            None => {}
-            Some(m) => {
-                // TODO fight the monster
-                self.player.change_life(-1);
-                m.decrease_life(1);
-                return m.is_dead();
                 }
             };
-        true
+            match tmp.1 {
+                Some(Artifact::Chest {gold}) => {
+                    self.levels[player_pos.get_level()].remove_artifact(new_x, new_y);
+                    self.player.add_gold(gold);
                 }
-    pub fn player_collects_artifact(&mut self) {
+                _ => {}
-        let player_pos = &self.player.get_immutable_position();
+            }
-        let player_level = player_pos.get_level();
+            // match tmp.2 {
-        let level = &mut self.levels[player_level];
+            //     Some(enemy) => {
-        let (_, _, a) = level.get_element(player_pos.get_x() as i16, player_pos.get_y() as i16);
+            //         // todo!("implement fighting!");
-        match a {
+            //         self.levels[player_pos.get_level()].attack(new_x, new_y, &mut self.player);
-            None => {}
+            //     }
-            Some(a) => {
+            //     _ => {}
-                a.collect(&mut self.player);
+            // }
         }
     }
 }
-    /// updates the player's current level. This will remove collected artifacts and dead monsters.
-    pub fn update_level(&mut self) {
-        let player_pos = &self.player.get_immutable_position();
-        let player_level = player_pos.get_level();
-        let level = &mut self.levels[player_level];
-        level.update();
-    }
-}
-
-#[test]
-fn game_has_correct_number_of_levels() {
-    let p = Player::new("foo", 42);
-    let g = Game::new(p);
-    assert_eq!(g.levels.len(), LEVELS);
-}
-
-#[test]
-fn game_has_player() {
-    let p = Player::new("foo", 42);
-    let g = Game::new(p);
-    assert_eq!(g.get_player().get_name(), "foo");
-    assert_eq!(g.get_player().get_immutable_position().get_level(), 0);
-}
-
-#[test]
-fn game_has_mutable_player() {
-    let p = Player::new("foo", 42);
-    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);
-}
-
-#[test]
-fn game_get_level() {
-    let p = Player::new("foo", 42);
-    let mut g = Game::new(p);
-    g.get_level(0);
-    assert_ne!(g.get_level(0).start, (0, 0));
-    g.get_mutable_level(0).discover(&Position::new(0, 1, 1));
-}

src/level.rs

@@ -1,11 +1,6 @@
 use std::cmp::{max, min};
-
-#[cfg(test)]
-use crate::artifacts::{Chest, Potion};
-use crate::artifacts::Artifact;
 use crate::monster::Monster;
-#[cfg(test)]
+use crate::player::Player;
-use crate::monster::Rat;
 use crate::position::Position;
 
 pub const LEVEL_WIDTH: usize = 50;
@@ -13,47 +8,79 @@ pub const LEVEL_HEIGHT: usize = 25;
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum StructureElement {
-    Start,
-    End,
     Wall,
     Floor,
     StairDown,
     StairUp,
+    Start,
+    End,
     Unknown,
 }
 
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum Artifact {
+    Chest { gold: usize },
+}
+
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Level {
-    pub(crate) level: usize,
     pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
     pub(crate) discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
-    pub(crate) monsters: Vec<Box<dyn Monster>>,
+    pub(crate) artifacts: [[Option<Artifact>; LEVEL_HEIGHT]; LEVEL_WIDTH],
-    pub(crate) artifacts: Vec<Box<dyn Artifact>>,
+    pub(crate) enemies: [[Option<Monster>; LEVEL_HEIGHT]; LEVEL_WIDTH],
-    /// the position of the start in the level (either stair up or start point)
+    pub(crate) start_x: usize,
-    pub(crate) start: (usize, usize),
+    pub(crate) start_y: usize,
-    /// the position of the end in the level (either stair down or end point)
+    pub(crate) end_x: usize,
-    pub(crate) end: (usize, usize),
+    pub(crate) end_y: usize,
 }
 
 impl Level {
-    #[cfg(test)]
+    pub fn new() -> Level {
-    pub fn new(level: usize) -> Level {
+        let s = [[StructureElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
-        let mut s = [[StructureElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
-        for x in 2..LEVEL_WIDTH - 2 {
-            for y in 2..LEVEL_HEIGHT - 2 {
-                s[x][y] = StructureElement::Floor;
-            }
-        }
         Level {
-            level,
             structure: s,
             discovered: [[false; LEVEL_HEIGHT]; LEVEL_WIDTH],
-            monsters: Vec::with_capacity(10),
+            artifacts: [[None; LEVEL_HEIGHT]; LEVEL_WIDTH],
-            artifacts: Vec::with_capacity(10),
+            enemies: [[None; LEVEL_HEIGHT]; LEVEL_WIDTH],
-            start: (0, 0),
+            start_x: 1,
-            end: (0, 0),
+            start_y: 1,
+            end_x: 1,
+            end_y: 1,
         }
     }
-    pub fn get_element(&mut self, x: i16, y: i16) -> (Option<StructureElement>, Option<&mut Box<(dyn Monster + 'static)>>, Option<&mut Box<(dyn Artifact + 'static)>>) {
+    pub(crate) fn attack(&self, x: i16, y: i16, player: &mut Player) -> bool {
+        if x < 0 || y < 0 {
+            return false;
+        }
+        let x = x as usize;
+        let y = y as usize;
+        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
+            return false;
+        }
+
+        match &self.enemies[x][y] {
+            Some(mut enemy) => {
+                player.change_life(-1);
+                enemy.decrease_life(1);
+                println!("{}",enemy.get_life());
+                return enemy.get_life() == 0
+            }
+            _ => {}
+        }
+        false
+    }
+    pub fn remove_artifact(&mut self, x: i16, y: i16) {
+        if x < 0 || y < 0 {
+            return;
+        }
+        let x = x as usize;
+        let y = y as usize;
+        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
+            return;
+        }
+        self.artifacts[x][y] = None;
+    }
+    pub fn get_element(&self, x: i16, y: i16) -> (Option<StructureElement>, Option<Artifact>, Option<Monster>) {
         if x < 0 || y < 0 {
             return (None, None, None);
         }
@@ -62,53 +89,14 @@ impl Level {
         if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
             return (None, None, None);
         }
-        if !self.discovered[x][y] {
+        // if !self.discovered[x][y] {
-            return (Some(StructureElement::Unknown), None, None);
+        // if !self.discovered[x][y] {
-        }
+        //     return (Some(StructureElement::Unknown), None, None);
-        let search_pos = &Position::new(self.level, x, y);
+        // }
-        let mut res_m: Option<&mut Box<dyn Monster>> = None;
+        return (Some(self.structure[x][y]), self.artifacts[x][y], self.enemies[x][y]);
-        for m in &mut self.monsters {
-            if m.get_immutable_position() == search_pos {
-                res_m = Some(m);
-            }
-        }
-        let mut res_a: Option<&mut Box<dyn Artifact>> = None;
-        for a in &mut self.artifacts {
-            if a.get_immutable_position() == search_pos {
-                res_a = Some(a);
-            }
-        }
-        (Some(self.structure[x][y]), res_m, res_a)
-    }
-    #[cfg(test)]
-    pub fn add_monster(&mut self, mut monster: impl Monster + 'static) -> Result<(), String> {
-        if self.level != monster.get_position().get_level() {
-            return Err("Wrong Level".to_string());
-        }
-        for m in &mut self.monsters {
-            if m.get_position() == monster.get_position() {
-                return Err("Position already used".to_string());
-            }
-        }
-        self.monsters.push(Box::new(monster));
-        Ok(())
-    }
-
-    #[cfg(test)]
-    pub fn add_artifact(&mut self, artifact: impl Artifact + 'static) -> Result<(), String> {
-        if self.level != artifact.get_immutable_position().get_level() {
-            return Err("Wrong Level".to_string());
-        }
-        for a in &mut self.artifacts {
-            if a.get_immutable_position() == artifact.get_immutable_position() {
-                return Err("Position already used".to_string());
-            }
-        }
-        self.artifacts.push(Box::new(artifact));
-        Ok(())
     }
     /// discover the area with in the level around the given position
-    pub fn discover(&mut self, pos: &Position) {
+    pub fn discover(&mut self, pos: Position) {
         let x = pos.get_x();
         let y = pos.get_y();
 
@@ -151,135 +139,13 @@ impl Level {
             }
         }
     }
-
-    pub fn update(&mut self) {
-        for (index, a) in &mut self.artifacts.iter().enumerate() {
-            if a.was_collected() {
-                self.artifacts.remove(index);
-                break;
-            }
-        }
-        for (index, m) in &mut self.monsters.iter().enumerate() {
-            if m.is_dead() {
-                self.monsters.remove(index);
-                break;
-            }
-        }
-    }
 }
 
 #[test]
 fn test_get_element() {
-    let mut l = Level::new(0);
+    let l = Level::new();
-    assert_eq!(l.get_element(-1, -1).0, None);
+    assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Wall);
-    assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Unknown);
+    assert_eq!(l.get_element(4, 4).0.unwrap(), StructureElement::StairDown);
-    assert_eq!(l.get_element(LEVEL_WIDTH as i16 - 1, LEVEL_HEIGHT as i16 - 1).0.unwrap(), StructureElement::Unknown);
+    assert_eq!(l.get_element(49, 24).0.unwrap(), StructureElement::Wall);
-    assert_eq!(l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16).0, None);
+    assert_eq!(l.get_element(50, 25).0, None);
-}
-
-#[test]
-fn test_discover_get_element() {
-    let mut l = Level::new(0);
-    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Unknown);
-    let p = Position::new(0, 10, 10);
-    l.discover(&p);
-    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
-    assert_eq!(l.get_element(9, 10).0.unwrap(), StructureElement::Floor);
-    assert_eq!(l.get_element(10, 9).0.unwrap(), StructureElement::Floor);
-    assert_eq!(l.get_element(11, 10).0.unwrap(), StructureElement::Floor);
-    assert_eq!(l.get_element(10, 11).0.unwrap(), StructureElement::Floor);
-}
-
-#[test]
-fn test_discover_can_add_monster() {
-    let mut l = Level::new(0);
-    let mut m = Rat::new(2);
-    m.get_position().set(1, 2, 3);
-    assert_eq!(l.add_monster(m), Err("Wrong Level".to_string()));
-
-    let mut m = Rat::new(2);
-    m.get_position().set(0, 2, 3);
-    assert_eq!(l.add_monster(m), Ok(()));
-
-    let mut m = Rat::new(2);
-    m.get_position().set(0, 2, 3);
-    assert_eq!(l.add_monster(m), Err("Position already used".to_string()));
-
-    let mut m = Rat::new(2);
-    m.get_position().set(0, 2, 4);
-    assert_eq!(l.add_monster(m), Ok(()));
-}
-
-#[test]
-fn test_discover_can_add_artifact() {
-    let mut l = Level::new(0);
-    let a = Chest::new(Position::new(1, 2, 3));
-    assert_eq!(l.add_artifact(a), Err("Wrong Level".to_string()));
-
-    let a = Chest::new(Position::new(0, 2, 3));
-    assert_eq!(l.add_artifact(a), Ok(()));
-
-    let a = Potion::new(Position::new(0, 2, 3));
-    assert_eq!(l.add_artifact(a), Err("Position already used".to_string()));
-
-    let a = Chest::new(Position::new(0, 1, 3));
-    assert_eq!(l.add_artifact(a), Ok(()));
-}
-
-#[test]
-fn test_discover_get_monster() {
-    let mut l = Level::new(0);
-    let p = Position::new(0, 10, 10);
-    l.discover(&p);
-    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
-    assert!(l.get_element(10, 10).1.is_none());
-
-    let mut m = Rat::new(23);
-    m.get_position().set(0, 10, 10);
-    assert_eq!(l.add_monster(m), Ok(()));
-
-    let elem = l.get_element(10, 10);
-    assert_eq!(elem.0.unwrap(), StructureElement::Floor);
-    assert!(elem.1.is_some());
-    let m = elem.1.unwrap();
-    assert_eq!(m.get_life(), 23);
-
-    m.decrease_life(2);
-    assert_eq!(l.get_element(10, 10).1.unwrap().get_life(), 21);
-}
-
-#[test]
-fn test_discover_get_artifact() {
-    let mut l = Level::new(0);
-    let p = Position::new(0, 10, 10);
-    l.discover(&p);
-    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
-    assert!(l.get_element(10, 10).2.is_none());
-
-    let a = Chest::new(Position::new(0, 10, 10));
-    assert_eq!(l.add_artifact(a), Ok(()));
-
-    let elem = l.get_element(10, 10);
-    assert_eq!(elem.0.unwrap(), StructureElement::Floor);
-    assert!(elem.2.is_some());
-}
-
-#[test]
-fn test_discover_get_monster_can_move() {
-    let mut l = Level::new(0);
-    let p = Position::new(0, 10, 10);
-    l.discover(&p);
-
-    let mut m = Rat::new(23);
-    m.get_position().set(0, 10, 10);
-    l.add_monster(m).expect("Panic because of");
-
-    let m = l.get_element(10, 10).1.unwrap();
-    m.get_position().change(1, 1);
-
-    let m = l.get_element(10, 10).1;
-    assert!(m.is_none());
-    let m = l.get_element(11, 11).1;
-    assert!(m.is_some());
-    assert_eq!(m.unwrap().get_life(), 23);
 }

src/level_generator.rs

@@ -9,19 +9,16 @@ use rand::prelude::SliceRandom;
 use rand::Rng;
 use rand::rngs::ThreadRng;
 
-use crate::artifacts::{Artifact, Chest, Potion};
+use crate::level::{Artifact, Level, StructureElement};
-use crate::level::{Level, StructureElement};
+use crate::monster::Monster;
-use crate::monster::{Monster, Orc, Rat};
-use crate::position::Position;
 
 const ROOMS_VERTICAL: usize = 7;
 const ROOMS_HORIZONTAL: usize = 4;
-
 const ROOM_WIDTH: usize = 7;
 const ROOM_HEIGHT: usize = 6;
 
-#[derive(PartialEq, Copy, Clone)]
+#[derive(Copy, Clone, Debug, PartialEq)]
-enum RoomType {
+pub enum RoomType {
     Start,
     End,
     StairUp,
@@ -32,13 +29,13 @@ enum RoomType {
     EmptyRoom,
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 struct ConnectionInfo {
     offset: usize,
     distance: usize,
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 struct Room {
     pub kind: RoomType,
     pub offset_x: usize,
@@ -47,6 +44,7 @@ struct Room {
     pub height: usize,
     pub connection_down: Option<ConnectionInfo>,
     pub connection_right: Option<ConnectionInfo>,
+    // pub connected: bool,
 }
 
 impl Room {
@@ -78,13 +76,13 @@ impl Room {
     }
 }
 
+#[derive(Debug)]
 pub struct LevelGenerator {
     rooms: [[Room; ROOMS_HORIZONTAL]; ROOMS_VERTICAL],
-    level: usize,
 }
 
 impl LevelGenerator {
-    pub fn generate(level: usize, first: bool, last: bool) -> Self {
+    pub fn generate(level: usize) -> Self {
         let mut rng = rand::thread_rng();
         let mut rooms = [[Room::new(); ROOMS_HORIZONTAL]; ROOMS_VERTICAL];
         let mut graph = UnGraph::<(usize, usize), u16>::default();
@@ -95,19 +93,18 @@ impl LevelGenerator {
         while !LevelGenerator::rooms_connectable(&rooms) {
             let mut room_types: Vec<RoomType> = Vec::with_capacity(ROOMS_HORIZONTAL * ROOMS_VERTICAL);
             // level 0 contains a start room, all others contain a stair up
-            if first {
+            if level == 0 {
                 room_types.push(RoomType::Start);
             } else {
                 room_types.push(RoomType::StairUp);
             }
             // level 24 (the last) contains an end room, all others a stair down
-            if last {
+            if level == 24 {
                 room_types.push(RoomType::End);
             } else {
                 room_types.push(RoomType::StairDown);
             }
             room_types.push(RoomType::MonsterRoom);
-            room_types.push(RoomType::TreasureRoom);
             // generate a random set of rooms and shuffle them
             for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL {
                 match rng.gen_range(1..=100) {
@@ -208,8 +205,7 @@ impl LevelGenerator {
         }
 
         LevelGenerator {
-            rooms,
+            rooms
-            level,
         }
     }
 
@@ -245,8 +241,8 @@ impl LevelGenerator {
     pub fn render(&self) -> Level {
         let mut rng = rand::thread_rng();
         let mut structure = [[StructureElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
-        let mut artifacts: Vec<Box<dyn Artifact>> = Vec::with_capacity(10);
+        let mut artifacts = [[None; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
-        let mut enemies: Vec<Box<dyn Monster>> = Vec::with_capacity(10);
+        let mut enemies = [[None; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
         let mut start_x: usize = 0;
         let mut start_y: usize = 0;
         let mut end_x: usize = 0;
@@ -264,27 +260,15 @@ impl LevelGenerator {
                 if room.kind == RoomType::TreasureRoom {
                     let t_x = left + room.offset_x + rng.gen_range(0..room.width);
                     let t_y = top + room.offset_y + rng.gen_range(0..room.height);
-                    // TODO randomize artifacts
+                    artifacts[t_x][t_y] = Some(Artifact::Chest { gold: rng.gen_range(2..30) });
-                    match rng.gen_range(1..=100) {
-                        1..=50 => { artifacts.push(Box::new(Chest::new(Position::new(self.level, t_x, t_y)))); }
-                        _ => { artifacts.push(Box::new(Potion::new(Position::new(self.level, t_x, t_y)))); }
-                    };
                 }
                 if room.kind == RoomType::MonsterRoom {
                     let t_x = left + room.offset_x + rng.gen_range(0..room.width);
                     let t_y = top + room.offset_y + rng.gen_range(0..room.height);
                     // TODO randomize enemies here
-                    match rng.gen_range(1..=100) {
+                    enemies[t_x][t_y] = Some(Monster::new(2));
-                        1..=50 => {
-                            println!("Orc! {} {} {}", self.level, t_x, t_y);
-                            enemies.push(Box::new(Orc::new_with_position(Position::new(self.level, t_x, t_y)))); }
-                        _ => {
-                            println!("Rat! {} {} {}", self.level, t_x, t_y);
-                            enemies.push(Box::new(Rat::new_with_position(Position::new(self.level, t_x, t_y))));}
-                    };
                 }
-
+                if room.kind == RoomType::StairDown {
-                if room.kind == RoomType::End || room.kind == RoomType::StairDown {
                     end_x = left + room.offset_x + rng.gen_range(0..room.width);
                     end_y = top + room.offset_y + rng.gen_range(0..room.height);
                 }
@@ -294,7 +278,6 @@ impl LevelGenerator {
                 if room.kind == RoomType::End {
                     structure[end_x][end_y] = StructureElement::End;
                 }
-
                 if room.kind == RoomType::Start || room.kind == RoomType::StairUp {
                     start_x = left + room.offset_x + rng.gen_range(0..room.width);
                     start_y = top + room.offset_y + rng.gen_range(0..room.height);
@@ -337,24 +320,21 @@ impl LevelGenerator {
             }
         }
         Level {
-            level: self.level,
             structure,
             discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH],
-            monsters: enemies,
             artifacts,
-            start: (start_x, start_y),
+            enemies,
-            end: (end_x, end_y),
+            start_x,
+            start_y,
+            end_x,
+            end_y,
         }
     }
 }
 
 #[test]
 fn test_level_gen() {
-    let level = LevelGenerator::generate(23, false, false).render();
+    let level = LevelGenerator::generate(0);
-    assert_eq!(level.level, 23);
+    println!("{:?}", level);
-    assert_ne!(level.start, (0, 0));
+    assert_eq!(1, 2);
-    assert_ne!(level.end, (0, 0));
-    assert_ne!(level.start, level.end);
-    assert_ne!(level.monsters.len(), 0);
-    assert_ne!(level.artifacts.len(), 0);
 }

src/level_widget.rs

@@ -1,16 +1,17 @@
-use ratatui::buffer::Buffer;
+use ratatui::prelude::*;
-use ratatui::layout::Rect;
+use ratatui::widgets::Widget;
-use ratatui::style::Color;
-use ratatui::widgets::{StatefulWidget, Widget};
 
 use crate::game::Game;
-use crate::level::StructureElement;
+use crate::level::{Artifact, Level, StructureElement};
 
 const FG_BROWN: Color = Color::Rgb(186, 74, 0);
 
-pub struct LevelWidget {}
+//⌂ α Ω
+pub struct LevelWidget<'a> {
+    pub game: &'a Game,
+}
 
-impl LevelWidget {
+impl<'a> LevelWidget<'a> {
     fn set_cell(&self, buf: &mut Buffer, x: u16, y: u16, symbol: &str, fg: Color, bg: Color) {
         buf.
             get_mut(x, y).
@@ -18,38 +19,93 @@ impl LevelWidget {
             set_bg(bg).
             set_fg(fg);
     }
+
+    fn calculate_wall(top: Option<StructureElement>, right: Option<StructureElement>, bottom: Option<StructureElement>, left: Option<StructureElement>) -> String {
+        let mut val = 0;
+        val += match top {
+            Some(n) => {
+                match n {
+                    StructureElement::Wall => 1,
+                    _ => 0
+                }
+            }
+            None => 0
+        };
+        val += match right {
+            Some(n) => {
+                match n {
+                    StructureElement::Wall => 2,
+                    _ => 0
+                }
+            }
+            None => 0
+        };
+        val += match bottom {
+            Some(n) => {
+                match n {
+                    StructureElement::Wall => 4,
+                    _ => 0
+                }
+            }
+            None => 0
+        };
+        val += match left {
+            Some(n) => {
+                match n {
+                    StructureElement::Wall => 8,
+                    _ => 0
+                }
+            }
+            None => 0
+        };
+        [
+            "╋", "┃", "━", "┗",
+            "┃", "┃", "┏", "┣",
+            "━", "┛", "━", "┻",
+            "┓", "┫", "┳", "╋",
+        ][val].to_string()
+    }
 }
 
-impl StatefulWidget for LevelWidget {
+impl<'a> Widget for LevelWidget<'a> {
-    type State = Game;
+    fn render(self, area: Rect, buf: &mut Buffer) {
+        let player = &self.game.player;
+        let player_pos = player.get_position();
+        let level: &Level = &self.game.levels[player_pos.get_level()];
 
-    fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
         let al: u16 = area.left();
         let at: u16 = area.top();
 
-        {
-            let player = state.get_mutable_player();
-            let player_pos = player.get_immutable_position();
-            let player_level = player_pos.get_level();
-
         // draw the level elements
         for x in al..area.right() {
             for y in at..area.bottom() {
-                    let level = state.get_mutable_level(player_level);
                 let level_x = (x - al) as i16;
                 let level_y = (y - at) as i16;
                 match level.get_element(level_x, level_y) {
-                        (Some(structure_element), None, None) => {
+                    (None, _, _) => {}
-                            match structure_element {
+                    (_, Some(e), _) => {
-                                StructureElement::Start => {
+                        match e {
-                                    self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
+                            Artifact::Chest { gold: _ } => {
+                                self.set_cell(buf, x, y, "⌂", Color::Black, Color::Gray);
                             }
-                                StructureElement::End => {
-                                    self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
                         }
+                    }
+                    (_, _, Some(e)) => {
+                        match e {
+                            Ene => {
+                                self.set_cell(buf, x, y, "R", Color::Black, Color::Gray);
+                            }
+                        }
+                    }
+                    (Some(e), _, _) => {
+                        match e {
                             StructureElement::Wall => {
-                                    // TODO add fancy walls
+                                let top = level.get_element(level_x, level_y - 1).0;
-                                    self.set_cell(buf, x, y, "#", FG_BROWN, Color::Gray);
+                                let right = level.get_element(level_x + 1, level_y).0;
+                                let bottom = level.get_element(level_x, level_y + 1).0;
+                                let left = level.get_element(level_x - 1, level_y).0;
+                                let symbol = LevelWidget::calculate_wall(top, right, bottom, left);
+                                self.set_cell(buf, x, y, symbol.as_str(), FG_BROWN, Color::Gray);
                             }
                             StructureElement::Floor => {
                                 self.set_cell(buf, x, y, " ", FG_BROWN, Color::Gray);
@@ -63,31 +119,63 @@ impl StatefulWidget for LevelWidget {
                             StructureElement::Unknown => {
                                 self.set_cell(buf, x, y, "▒", Color::DarkGray, Color::Gray);
                             }
+                            StructureElement::Start => {
+                                self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
                             }
-                        }
+                            StructureElement::End => {
-                        (_, Some(m), _) => {
+                                self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
-                            let (s, c) = m.get_representation();
-                            self.set_cell(buf, x, y, s, c, Color::Gray);
-                        }
-                        (_, _, Some(t)) => {
-                            let (s, c) = t.get_representation();
-                            self.set_cell(buf, x, y, s, c, Color::Gray);
-                        }
-                        (None, None, None) => {}
-                    };
                             }
                         }
                     }
-        {
+                }
-            let player = state.get_mutable_player();
+            }
-            let player_pos = player.get_immutable_position();
+        }
+
+        // draw player
         let player_x = al + player_pos.get_x() as u16;
         let player_y = at + player_pos.get_y() as u16;
         self.set_cell(buf, player_x, player_y, "8", Color::Red, Color::Gray);
     }
 }
+
+#[test]
+fn test_get_wall_symbol() {
+    let wall = Some(StructureElement::Wall);
+    // 0
+    let s = LevelWidget::calculate_wall(None, None, None, None);
+    assert_eq!(s, "╋");
+    // 15
+    let s = LevelWidget::calculate_wall(wall, wall, wall, wall);
+    assert_eq!(s, "╋");
+
+    // 1
+    let s = LevelWidget::calculate_wall(wall, None, None, None);
+    assert_eq!(s, "┃");
+    // 5
+    let s = LevelWidget::calculate_wall(wall, None, wall, None);
+    assert_eq!(s, "┃");
+    // 4
+    let s = LevelWidget::calculate_wall(None, None, wall, None);
+    assert_eq!(s, "┃");
+
+    // 2
+    let s = LevelWidget::calculate_wall(None, wall, None, None);
+    assert_eq!(s, "━");
+    // 10
+    let s = LevelWidget::calculate_wall(None, wall, None, wall);
+    assert_eq!(s, "━");
+
+    // 9
+    let s = LevelWidget::calculate_wall(wall, None, None, wall);
+    assert_eq!(s, "┛");
+    // 3
+    let s = LevelWidget::calculate_wall(wall, wall, None, None);
+    assert_eq!(s, "┗");
+    // 6
+    let s = LevelWidget::calculate_wall(None, wall, wall, None);
+    assert_eq!(s, "┏");
+    // 12
+    let s = LevelWidget::calculate_wall(None, None, wall, wall);
+    assert_eq!(s, "┓");
 }
 
-impl Widget for LevelWidget {
-    fn render(self, _area: Rect, _buf: &mut Buffer) {}
-}

src/main.rs

@@ -1,5 +1,4 @@
-use std::io::Result;
+use std::io::{Result, stdout};
-use std::io::stdout;
 
 use crossterm::{
     event::{self, KeyCode, KeyEventKind},
@@ -15,8 +14,9 @@ use ratatui::widgets::Block;
 use whoami::realname;
 
 use crate::game::Game;
+use crate::level::Level;
+use crate::level_generator::LevelGenerator;
 use crate::level_widget::LevelWidget;
-// use crate::level_widget::LevelWidget;
 use crate::player::Player;
 
 mod game;
@@ -25,12 +25,19 @@ mod level;
 mod position;
 mod level_widget;
 mod level_generator;
-mod artifacts;
 mod monster;
 
-//
 fn main() -> Result<()> {
-    let mut game = Game::new(Player::new(realname().as_str(), 10));
+    let mut levels: [Level; 25] = [Level::new(); 25];
+    for l in 0..25 {
+        levels[l] = LevelGenerator::generate(l).render();
+    }
+    let mut g = Game {
+        player: Player::new(realname().as_str(), 10),
+        levels,
+    };
+
+    g.move_player(levels[0].start_x as i16, levels[0].start_y as i16);
 
     stdout().execute(EnterAlternateScreen)?;
     enable_raw_mode()?;
@@ -57,7 +64,7 @@ fn main() -> Result<()> {
                 width: level::LEVEL_WIDTH as u16,
                 height: level::LEVEL_HEIGHT as u16,
             };
-            frame.render_stateful_widget(LevelWidget {}, map_area, &mut game);
+            frame.render_widget(LevelWidget { game: &g }, map_area);
 
             let stats_area = Rect {
                 x: area.x + 50,
@@ -67,11 +74,11 @@ fn main() -> Result<()> {
             };
             frame.render_widget(
                 Paragraph::new(format!("{}\nHealth: {}/{}\nGold: {}\nLevel: {}",
-                                       game.get_player().get_name(),
+                                       g.player.get_name(),
-                                       game.get_player().get_life(),
+                                       g.player.get_life(),
-                                       game.get_player().get_max_life(),
+                                       g.player.get_max_life(),
-                                       game.get_player().get_gold(),
+                                       g.player.get_gold(),
-                                       game.get_player().get_immutable_position().get_level()))
+                                       g.player.get_position().get_level()))
                     .white()
                     .on_blue(),
                 stats_area,
@@ -82,20 +89,20 @@ fn main() -> Result<()> {
                 if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
                     break;
                 }
-                if key.kind == KeyEventKind::Press {
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('d') {
-                    let new_pos = match key.code {
+                    ;
-                        KeyCode::Left => { game.move_player(-1, 0) }
-                        KeyCode::Right => { game.move_player(1, 0) }
-                        KeyCode::Up => { game.move_player(0, -1) }
-                        KeyCode::Down => { game.move_player(0, 1) }
-                        _ => { (0, 0) }
-                    };
-                    if !game.player_fights_monster() {
-                        // player attacked monster but did not kill it
-                        game.move_player(new_pos.0, new_pos.1);
                 }
-                    game.player_collects_artifact();
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Left {
-                    game.update_level();
+                    g.move_player(-1, 0);
+                }
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Right {
+                    g.move_player(1, 0);
+                }
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Up {
+                    g.move_player(0, -1);
+                }
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Down {
+                    g.move_player(0, 1);
                 }
             }
         }

src/monster.rs

@@ -1,122 +1,20 @@
-use ratatui::prelude::Color;
+use std::cmp::{max, min};
 
 use crate::position::Position;
 
-pub trait Monster {
+#[derive(Copy, Clone, Debug, PartialEq)]
-    fn is_dead(&self) -> bool;
+pub struct Monster {
-    fn get_representation(&self) -> (&str, Color);
-    fn decrease_life(&mut self, by: usize);
-    fn get_immutable_position(&self) -> &Position;
-    #[cfg(test)]
-    fn get_position(&mut self) -> &mut Position;
-    #[cfg(test)]
-    fn get_life(&self) -> usize;
-}
-
-macro_rules! default_monster {
-    ($($t:ty),+ $(,)?) => ($(
-        impl Monster for $t {
-            fn is_dead(&self) -> bool { self.life <= 0 }
-            fn get_representation(&self) -> (&str, Color) { (&self.symbol, self.color) }
-            fn decrease_life(&mut self, by: usize) {
-                self.life = self.life.saturating_sub(by);
-            }
-            fn get_immutable_position(&self) -> &Position {
-                &self.position
-            }
-            #[cfg(test)]
-            fn get_position(&mut self) -> &mut Position {
-                &mut self.position
-            }
-            #[cfg(test)]
-            fn get_life(&self) -> usize { self.life }
-        }
-    )+)
-}
-
-pub struct Rat {
     life: usize,
-    position: Position,
-    symbol: String,
-    color: Color,
 }
 
-impl Rat {
+impl Monster {
-    #[cfg(test)]
+    pub fn new(life: usize) -> Monster {
-    pub fn new(life: usize) -> Self {
+        Monster {
-        Self {
             life,
-            position: Position::new(0, 0, 0),
-            symbol: String::from("R"),
-            color: Color::Black,
         }
     }
-    pub fn new_with_position(position: Position) -> Self {
-        Self {
-            life: 2,
-            position,
-            symbol: String::from("R"),
-            color: Color::Black,
-        }
-    }
-    #[cfg(test)]
     pub fn get_life(&self) -> usize { self.life }
-}
+    pub fn decrease_life(&mut self, by: i16) {
-default_monster!(Rat);
+        self.life = max(0, (self.life as i16 - by) as usize);
-
-pub struct Orc {
-    life: usize,
-    position: Position,
-    symbol: String,
-    color: Color,
-}
-
-impl Orc {
-    #[cfg(test)]
-    pub fn new(life: usize) -> Self {
-        Self {
-            life,
-            position: Position::new(0, 0, 0),
-            symbol: String::from("O"),
-            color: Color::DarkGray,
     }
 }
-    pub fn new_with_position(position: Position) -> Self {
-        Self {
-            life: 4,
-            position,
-            symbol: String::from("O"),
-            color: Color::DarkGray,
-        }
-    }
-    #[cfg(test)]
-    pub fn get_life(&self) -> usize { self.life }
-}
-
-default_monster!(Orc);
-
-
-#[test]
-fn monsters_can_move() {
-    let mut m = Rat::new(2);
-    assert_eq!(m.get_position(), &Position::new(0, 0, 0));
-    m.get_position().change(1, 2);
-    assert_eq!(m.get_position(), &Position::new(0, 1, 2));
-    m.get_position().change(2, 1);
-    assert_eq!(m.get_position(), &Position::new(0, 3, 3));
-    m.get_position().set(1, 2, 3);
-    m.get_position().change(2, 1);
-    assert_eq!(m.get_position(), &Position::new(1, 4, 4));
-}
-
-#[test]
-fn monsters_can_die() {
-    let mut m = Rat::new(2);
-    assert_eq!(m.get_life(), 2);
-    assert_eq!(m.is_dead(), false);
-    m.decrease_life(1);
-    assert_eq!(m.get_life(), 1);
-    m.decrease_life(2);
-    assert_eq!(m.get_life(), 0);
-    assert_eq!(m.is_dead(), true);
-}

src/player.rs

@@ -5,45 +5,45 @@ use crate::position::Position;
 pub struct Player {
     name: String,
     position: Position,
-    life: i16,
-    max_life: i16,
     gold: usize,
+    life: usize,
+    max_life: usize,
 }
 
 impl Player {
-    pub fn new(name: &str, max_life: i16) -> Player {
+    pub fn new(name: &str, max_life: usize) -> Player {
         Player {
             name: name.to_string(),
             position: Position::new(0, 0, 0),
+            gold: 0,
             life: max_life,
             max_life,
-            gold: 0,
         }
     }
     pub fn get_name(&self) -> String {
         return self.name.clone();
     }
-    pub fn change_life(&mut self, by: i16) {
+    pub fn get_life(&self) -> usize { self.life }
-        self.life = max(0, min(self.max_life, self.life + by));
+    pub fn get_max_life(&self) -> usize { self.max_life }
-    }
-    pub fn get_life(&self) -> i16 {
-        self.life
-    }
-    pub fn get_max_life(&self) -> i16 {
-        self.max_life
-    }
-    pub fn get_position(&mut self) -> &mut Position {
-        &mut self.position
-    }
-    pub fn get_immutable_position(&self) -> &Position {
-        &self.position
-    }
-
-    /// add the given amount to the players gold stash
-    pub fn retrieve_gold(&mut self, amount: usize) { self.gold += amount }
-
-    /// return the size of the players gold stash
     pub fn get_gold(&self) -> usize { self.gold }
+    pub fn add_gold(&mut self, amount: usize) { self.gold += amount; }
+    pub fn change_life(&mut self, by: i16) {
+        self.life = max(0,
+                        min(self.max_life,
+                            (self.life as i16 + by) as usize,
+                        ),
+        );
+    }
+    pub fn get_position(&self) -> Position {
+        self.position
+    }
+    pub fn change_position(&mut self, dx: i16, dy: i16) {
+        self.position.change(dx, dy);
+    }
+
+    pub fn set_position(&mut self, level: usize, x: usize, y: usize) {
+        self.position.set(level, x, y);
+    }
 }
 
 #[test]
@@ -51,63 +51,27 @@ fn test_get_name() {
     let p = Player {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
+        gold: 0,
         life: 5,
         max_life: 10,
-        gold: 0,
     };
     assert_eq!(p.get_name(), "Teddy Tester");
 }
 
-#[test]
-fn test_can_receive_gold() {
-    let mut p = Player::new("Teddy Tester", 10);
-    assert_eq!(p.get_gold(), 0);
-
-    p.retrieve_gold(13);
-    p.retrieve_gold(10);
-    assert_eq!(p.get_gold(), 23);
-}
-
 #[test]
 fn test_change_life() {
     let mut p = Player {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
+        gold: 0,
         life: 5,
         max_life: 10,
-        gold: 0,
     };
-    assert_eq!(p.get_life(), 5);
+    assert_eq!(p.life, 5);
     p.change_life(-2);
-    assert_eq!(p.get_life(), 3);
+    assert_eq!(p.life, 3);
     p.change_life(10);
-    assert_eq!(p.get_life(), 10);
+    assert_eq!(p.life, 10);
     p.change_life(-12);
-    assert_eq!(p.get_life(), 0);
+    assert_eq!(p.life, 0);
-}
-
-#[test]
-fn player_can_move() {
-    let mut p = Player::new("Teddy Tester", 10);
-    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));
-    p.get_position().change(2, 1);
-    assert_eq!(p.get_position(), &Position::new(0, 3, 3));
-    p.get_position().set(1, 2, 3);
-    p.get_position().change(2, 1);
-    assert_eq!(p.get_position(), &Position::new(1, 4, 4));
-    assert_eq!(p.get_immutable_position(), &Position::new(1, 4, 4));
-}
-
-#[test]
-fn test_max_life() {
-    let p = Player {
-        name: "Teddy Tester".to_string(),
-        position: Position::new(0, 1, 1),
-        life: 5,
-        max_life: 10,
-        gold: 0,
-    };
-    assert_eq!(p.get_max_life(), 10);
 }

src/position.rs

@@ -1,6 +1,4 @@
-use std::cmp::max;
+#[derive(Copy, Clone, Debug, PartialEq)]
-
-#[derive(PartialEq, Debug)]
 pub struct Position {
     level: usize,
     x: usize,
@@ -15,17 +13,6 @@ impl Position {
             y,
         }
     }
-    pub fn change(&mut self, dx: i16, dy: i16) -> (usize, usize) {
-        self.x = max((self.x as i16) + dx, 0) as usize;
-        self.y = max((self.y as i16) + dy, 0) as usize;
-        (self.x, self.y)
-    }
-    pub fn set(&mut self, level: usize, x: usize, y: usize) {
-        self.level = level;
-        self.x = x;
-        self.y = y;
-    }
-
     pub fn get_level(&self) -> usize{
         self.level
     }
@@ -34,35 +21,17 @@ impl Position {
         self.x
     }
 
-    pub fn get_y(&self) -> usize { self.y }
+    pub fn get_y(&self) -> usize {
+        self.y
     }
 
-#[test]
+    pub fn change(&mut self, dx: i16, dy: i16) {
-fn test_position_change() {
+        self.x = ((self.x as i16) + dx) as usize;
-    let mut p = Position::new(0, 10, 10);
+        self.y = ((self.y as i16) + dy) as usize;
-
+    }
-    let res = p.change(-1, 1);
+    pub fn set(&mut self, level: usize, x: usize, y:usize) {
-    assert_eq!(res, (9, 11));
+        self.level = level;
-    assert_eq!(p.get_x(), 9);
+        self.x = x;
-    assert_eq!(p.get_y(), 11);
+        self.y = y;
-
-    let res = p.change(-9, 1);
-    assert_eq!(res, (0, 12));
-    assert_eq!(p.get_x(), 0);
-    assert_eq!(p.get_y(), 12);
-
-    let res = p.change(-1, -13);
-    assert_eq!(res, (0, 0));
-    assert_eq!(p.get_x(), 0);
-    assert_eq!(p.get_y(), 0);
     }
-
-#[test]
-fn test_position_set() {
-    let mut p = Position::new(0, 10, 10);
-
-    p.set(1, 2, 3);
-    assert_eq!(p.get_level(), 1);
-    assert_eq!(p.get_x(), 2);
-    assert_eq!(p.get_y(), 3);
 }