Add variable artifacts

.idea/el_diabolo.iml

@@ -1,11 +0,0 @@
-<?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

@@ -38,12 +38,6 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
-[[package]]
-name = "bumpalo"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-
 [[package]]
 name = "cassowary"
 version = "0.3.0"
@@ -92,33 +86,7 @@ name = "el_diabolo"
 version = "0.1.0"
 dependencies = [
  "crossterm",
- "petgraph",
- "rand",
  "ratatui",
- "whoami",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "getrandom"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
 ]
 
 [[package]]
@@ -137,16 +105,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "indexmap"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
 [[package]]
 name = "indoc"
 version = "2.0.4"
@@ -162,15 +120,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "js-sys"
-version = "0.3.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.149"
@@ -249,22 +198,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
-[[package]]
-name = "petgraph"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.69"
@@ -283,36 +216,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "ratatui"
 version = "0.24.0"
@@ -451,80 +354,6 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
-
-[[package]]
-name = "web-sys"
-version = "0.3.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "whoami"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
-dependencies = [
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"

Cargo.toml

@@ -8,6 +8,3 @@ edition = "2021"
 [dependencies]
 ratatui = "0.24.0"
 crossterm = "0.27.0"
-rand = "0.8.5"
-petgraph = "0.6.4"
-whoami = "1.4.1"

src/artifacts.rs

@@ -0,0 +1,56 @@
+use crate::position::Position;
+use crate::player::Player;
+
+pub trait Artifact {
+    //! An artifact that can be collected by the player
+    /// 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);
+}
+
+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_immutable_position(&self) -> &Position { &self.position }
+    fn collect(&mut self, player: &mut Player) {
+        player.retrieve_gold(self.gold);
+        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_immutable_position(&self) -> &Position { &self.position }
+    fn collect(&mut self, player: &mut Player) {
+        player.change_life(self.health.try_into().unwrap());
+        self.health = 0;
+    }
+}

src/game.rs

@@ -1,54 +1,23 @@
-use crate::level::{Level, LevelElement};
+use crate::level::Level;
 use crate::player::Player;
 
-pub struct Game {
+pub const LEVELS: usize = 2;
-    pub player: Player,
+
-    pub levels: [Level; 25],
+pub struct Game<'game> {
+    pub player: &'game mut Player,
+    pub levels: Vec<Level>,
 }
 
-impl Game {
+impl Game<'_> {
-    pub fn move_player(&mut self, dx: i16, dy: i16) {
+    pub fn new(p: &mut Player) -> Game {
-        // check if move is allowed first
+        let mut v: Vec<Level> = Vec::with_capacity(LEVELS);
-        let player = &self.player;
+        for d in 0..LEVELS {
-        let player_pos = player.get_position();
+            let l = Level::new(d);
-        let level = &self.levels[player_pos.get_level()];
+            v.push(l);
-        let new_x: i16 = player_pos.get_x() as i16 + dx;
+        }
-        let new_y: i16 = player_pos.get_y() as i16 + dy;
+        Game {
-        let can_go: bool = match level.get_element(new_x, new_y) {
+            player: p,
-            None => { false }
+            levels: v,
-            Some(t) => {
-                match t {
-                    LevelElement::Wall => { false }
-                    _ => { true }
-                }
-            }
-        };
-        if can_go {
-            match level.get_element(new_x, new_y).unwrap() {
-                LevelElement::StairDown => {
-                    let next_level = player_pos.get_level() + 1;
-                    let start_x: usize = self.levels[next_level].start_x;
-                    let start_y: usize = self.levels[next_level].start_y;
-                    self.player.set_position(next_level, start_x, start_y);
-                    self.levels[next_level].discover(self.player.get_position());
-                }
-                LevelElement::StairUp => {
-                    self.player.set_position(
-                        player_pos.get_level() - 1,
-                        self.levels[player_pos.get_level() - 1].end_x,
-                        self.levels[player_pos.get_level() - 1].end_y,
-                    );
-                }
-                LevelElement::Chest {gold} => {
-                    self.player.add_gold(gold);
-                    self.player.change_position(dx, dy);
-                    self.levels[player_pos.get_level()].discover(self.player.get_position());
-                }
-                _ => {
-                    self.player.change_position(dx, dy);
-                    self.levels[player_pos.get_level()].discover(self.player.get_position());
-                }
-            };
         }
     }
 }

src/level.rs

@@ -1,98 +1,163 @@
 use std::cmp::{max, min};
+use crate::artifacts::{Artifact, Chest, Potion};
+use crate::monster::Monster;
 use crate::position::Position;
 
 pub const LEVEL_WIDTH: usize = 50;
 pub const LEVEL_HEIGHT: usize = 25;
 
 #[derive(Copy, Clone, Debug, PartialEq)]
-pub enum LevelElement {
+pub enum StructureElement {
     Wall,
     Floor,
     StairDown,
     StairUp,
-    Start,
-    End,
-    Chest { gold: usize },
     Unknown,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum RoomType {
-    Start,
-    End,
-    StairUp,
-    StairDown,
-    BasicRoom,
-    TreasureRoom,
-    EmptyRoom,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Level {
-    pub(crate) structure: [[LevelElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    level: usize,
-    pub(crate) discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
-    pub(crate) start_x: usize,
+    discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
-    pub(crate) start_y: usize,
+    monsters: Vec<Monster>,
-    pub(crate) end_x: usize,
+    artifacts: Vec<Box<dyn Artifact>>,
-    pub(crate) end_y: usize,
 }
 
 impl Level {
-    pub fn new() -> Level {
+    pub fn new(level: usize) -> Level {
-        let s = [[LevelElement::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],
-            start_x: 1,
+            monsters: Vec::with_capacity(10),
-            start_y: 1,
+            artifacts: Vec::with_capacity(10),
-            end_x: 1,
-            end_y: 1,
         }
     }
-    pub fn get_element(&self, x: i16, y: i16) -> Option<LevelElement> {
+    pub fn get_element(&mut self, x: i16, y: i16) -> (Option<StructureElement>, Option<&mut Monster>, Option<&mut Box<(dyn Artifact + 'static)>>) {
         if x < 0 || y < 0 {
-            return None;
+            return (None, None, None);
         }
         let x = x as usize;
         let y = y as usize;
         if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
-            return None;
+            return (None, None, None);
         }
-        if self.discovered[x][y] {
+        if !self.discovered[x][y] {
-            return Some(self.structure[x][y]);
+            return (Some(StructureElement::Unknown), None, None);
         }
-        return Some(LevelElement::Unknown);
+        let search_pos = &Position::new(self.level, x, y);
+        let mut res_m: Option<&mut Monster> = None;
+        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)
+    }
+    pub fn add_monster(&mut self, mut monster: Monster) -> 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(monster);
+        Ok(())
+    }
+
+    pub fn remove_dead_monster(&mut self, position: &Position) -> Result<(), String> {
+        if self.level != position.get_level() {
+            return Err("Wrong Level".to_string());
+        }
+        for (index, m) in &mut self.monsters.iter().enumerate() {
+            if m.get_immutable_position() == position {
+                if !m.is_dead() {
+                    return Err("Monster not dead".to_string());
+                }
+                self.monsters.remove(index);
+                break;
+            }
+        }
+        Ok(())
+    }
+    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(())
+    }
+    pub fn remove_artifact(&mut self, position: &Position) -> Result<(), String> {
+        if self.level != position.get_level() {
+            return Err("Wrong Level".to_string());
+        }
+        for (index, a) in &mut self.artifacts.iter().enumerate() {
+            if a.get_immutable_position() == position {
+                self.monsters.remove(index);
+                break;
+            }
+        }
+        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();
+
+        // uncover fields directly next to the player
         for x_r in max(x - 1, 0)..=min(x + 1, LEVEL_WIDTH - 1) {
             for y_r in max(y - 1, 0)..=min(y + 1, LEVEL_HEIGHT - 1) {
                 self.discovered[x_r][y_r] = true;
             }
         }
+
+        // uncover fields up to 2 fields right of the player
         for x_r in x..=min(x + 2, LEVEL_WIDTH - 1) {
             self.discovered[x_r][y] = true;
-            if self.structure[x_r][y] == LevelElement::Wall {
+            if self.structure[x_r][y] == StructureElement::Wall {
                 break;
             }
         }
+
+        // uncover fields up to 2 fields below of the player
         for y_r in y..=min(y + 2, LEVEL_HEIGHT - 1) {
             self.discovered[x][y_r] = true;
-            if self.structure[x][y_r] == LevelElement::Wall {
+            if self.structure[x][y_r] == StructureElement::Wall {
                 break;
             }
         }
+
+        // uncover fields up to 2 fields left of the player
         for x_r in (max(x, 2)..x + 2).rev() {
             self.discovered[x_r - 2][y] = true;
-            if self.structure[x_r - 2][y] == LevelElement::Wall {
+            if self.structure[x_r - 2][y] == StructureElement::Wall {
                 break;
             }
         }
+
+        // uncover fields up to 2 fields above of the player
         for y_r in (max(y, 2)..y + 2).rev() {
             self.discovered[x][y_r - 2] = true;
-            if self.structure[x][y_r - 2] == LevelElement::Wall {
+            if self.structure[x][y_r - 2] == StructureElement::Wall {
                 break;
             }
         }
@@ -101,9 +166,133 @@ impl Level {
 
 #[test]
 fn test_get_element() {
-    let l = Level::new();
+    let mut l = Level::new(0);
-    assert_eq!(l.get_element(0, 0).unwrap(), LevelElement::Wall);
+    assert_eq!(l.get_element(-1, -1).0, None);
-    assert_eq!(l.get_element(4, 4).unwrap(), LevelElement::StairDown);
+    assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Unknown);
-    assert_eq!(l.get_element(49, 24).unwrap(), LevelElement::Wall);
+    assert_eq!(l.get_element(LEVEL_WIDTH as i16 - 1, LEVEL_HEIGHT as i16 - 1).0.unwrap(), StructureElement::Unknown);
-    assert_eq!(l.get_element(50, 25), None);
+    assert_eq!(l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16).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 = Monster::new(2);
+    m.get_position().set(1, 2, 3);
+    assert_eq!(l.add_monster(m), Err("Wrong Level".to_string()));
+
+    let mut m = Monster::new(2);
+    m.get_position().set(0, 2, 3);
+    assert_eq!(l.add_monster(m), Ok(()));
+
+    let mut m = Monster::new(2);
+    m.get_position().set(0, 2, 3);
+    assert_eq!(l.add_monster(m), Err("Position already used".to_string()));
+
+    let mut m = Monster::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 = Monster::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 = Monster::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);
+}
+
+#[test]
+fn test_monster_can_be_removed() {
+    let mut level = Level::new(0);
+    level.discover(&Position::new(0, 10, 10));
+
+    let mut m = Monster::new(2);
+    m.get_position().set(0, 10, 10);
+    level.add_monster(m).expect("Panic because of");
+
+    let m = level.get_element(10, 10).1.unwrap();
+    m.decrease_life(3);
+
+    assert_eq!(level.remove_dead_monster(&Position::new(0, 10, 10)), Ok(()));
+
+    assert!(level.get_element(10, 10).1.is_none());
 }

src/level_generator.rs

@@ -1,315 +0,0 @@
-use std::cmp::{max, min};
-use std::ops::Range;
-
-use petgraph::algo::min_spanning_tree;
-use petgraph::data::*;
-use petgraph::graph::Graph;
-use petgraph::graph::UnGraph;
-use rand::prelude::SliceRandom;
-use rand::Rng;
-use rand::rngs::ThreadRng;
-
-use crate::level::{Level, LevelElement, RoomType};
-
-const ROOMS_VERTICAL: usize = 7;
-const ROOMS_HORIZONTAL: usize = 4;
-const ROOM_WIDTH: usize = 7;
-const ROOM_HEIGHT: usize = 6;
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-struct ConnectionInfo {
-    offset: usize,
-    distance: usize,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-struct Room {
-    pub kind: RoomType,
-    pub offset_x: usize,
-    pub offset_y: usize,
-    pub width: usize,
-    pub height: usize,
-    pub connection_down: Option<ConnectionInfo>,
-    pub connection_right: Option<ConnectionInfo>,
-    // pub connected: bool,
-}
-
-impl Room {
-    fn new() -> Self {
-        Self {
-            kind: RoomType::EmptyRoom,
-            offset_x: 0,
-            offset_y: 0,
-            width: 0,
-            height: 0,
-            connection_down: None,
-            connection_right: None,
-        }
-    }
-    /// change the size and position of a room randomly within its bounds
-    fn random(&mut self, rng: &mut ThreadRng) {
-        let width = rng.gen_range(3..6);
-        let height = rng.gen_range(3..5);
-        self.width = width;
-        self.height = height;
-        self.offset_x = rng.gen_range(0..(ROOM_WIDTH - width));
-        self.offset_y = rng.gen_range(0..(ROOM_HEIGHT - height));
-    }
-    fn get_x_range(&self) -> Range<usize> {
-        self.offset_x..self.offset_x + self.width
-    }
-    fn get_y_range(&self) -> Range<usize> {
-        self.offset_y..self.offset_y + self.height
-    }
-}
-
-#[derive(Debug)]
-pub struct LevelGenerator {
-    rooms: [[Room; ROOMS_HORIZONTAL]; ROOMS_VERTICAL],
-}
-
-impl LevelGenerator {
-    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();
-
-        // trick the room_connectable function into failing on the first iteration
-        rooms[0][0].kind = RoomType::BasicRoom;
-
-        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 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 level == 24 {
-                room_types.push(RoomType::End);
-            } else {
-                room_types.push(RoomType::StairDown);
-            }
-            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..=6) {
-                    // TODO tune room type distribution
-                    1..=3 => { room_types.push(RoomType::EmptyRoom) }
-                    _ => { room_types.push(RoomType::BasicRoom) }
-                }
-            }
-            room_types.shuffle(&mut rng);
-
-            graph.clear();
-            // place the rooms in the array an add nodes to the graph for every non empty room
-            for c in 0..ROOMS_VERTICAL {
-                for r in 0..ROOMS_HORIZONTAL {
-                    rooms[c][r].kind = room_types.pop().unwrap();
-                    if rooms[c][r].kind != RoomType::EmptyRoom {
-                        rooms[c][r].random(&mut rng);
-                        graph.add_node((c, r));
-                    }
-                }
-            }
-        }
-
-        // add edges to the graph connecting each room to all of its neighbours (max 4 of them)
-        for c in 0..ROOMS_VERTICAL {
-            for r in 0..ROOMS_HORIZONTAL {
-                if rooms[c][r].kind == RoomType::EmptyRoom {
-                    continue;
-                }
-                let src_index = graph.node_indices().find(|i| graph[*i] == (c, r)).unwrap();
-                for r_1 in r + 1..ROOMS_HORIZONTAL {
-                    if rooms[c][r_1].kind != RoomType::EmptyRoom {
-                        let tgt_index = graph.node_indices().find(|i| graph[*i] == (c, r_1)).unwrap();
-                        // todo use random weight for edge
-                        graph.add_edge(src_index, tgt_index, 1);
-                        break;
-                    }
-                }
-                for c_1 in c + 1..ROOMS_VERTICAL {
-                    if rooms[c_1][r].kind != RoomType::EmptyRoom {
-                        let tgt_index = graph.node_indices().find(|i| graph[*i] == (c_1, r)).unwrap();
-                        // todo use random weight for edge
-                        graph.add_edge(src_index, tgt_index, 1);
-                        break;
-                    }
-                }
-            }
-        }
-
-        // calculate a minimum spanning tree
-        let mst: Graph<(usize, usize), u16, petgraph::Undirected> = Graph::from_elements(min_spanning_tree(&graph));
-        for edge in mst.raw_edges() {
-            let src = mst[edge.source()];
-            let tgt = mst[edge.target()];
-
-            let src_room = rooms[src.0][src.1];
-            let mut tgt_room = rooms[tgt.0][tgt.1];
-
-            // cols are the same, either up or down
-            if src.0 == tgt.0 {
-                let range = LevelGenerator::range_overlap(src_room.get_x_range(), tgt_room.get_x_range());
-                let position: usize;
-                if range.is_empty() {
-                    position = range.start;
-                } else {
-                    position = rng.gen_range(range);
-                }
-                if src.1 < tgt.1 {
-                    // src to tgt
-                    rooms[src.0][src.1].connection_down = Some(ConnectionInfo { offset: position, distance: tgt.1 - src.1 });
-                } else {
-                    // tgt to src
-                    tgt_room.connection_down = Some(ConnectionInfo { offset: position, distance: src.1 - tgt.1 });
-                }
-            }
-            // rows are the same, either left or right
-            if src.1 == tgt.1 {
-                let range = LevelGenerator::range_overlap(src_room.get_y_range(), tgt_room.get_y_range());
-                let mut position: usize;
-                if range.is_empty() {
-                    position = range.start;
-                } else {
-                    position = rng.gen_range(range);
-                }
-                if src.1 == 0 && position == 0 {
-                    position = 1;
-                }
-                if src.0 < tgt.0 {
-                    // src to tgt
-                    rooms[src.0][src.1].connection_right = Some(ConnectionInfo { offset: position, distance: tgt.0 - src.0 });
-                } else {
-                    // tgt to src
-                    tgt_room.connection_right = Some(ConnectionInfo { offset: position, distance: src.1 - tgt.1 });
-                }
-            }
-        }
-
-        LevelGenerator {
-            rooms
-        }
-    }
-
-    fn range_overlap(r1: Range<usize>, r2: Range<usize>) -> Range<usize> {
-        max(r1.start, r2.start)..min(r1.end, r2.end)
-    }
-
-    /// Verifies that for a given matrix of rooms each room has at least one other room in the
-    /// same row or column.
-    fn rooms_connectable(rooms: &[[Room; ROOMS_HORIZONTAL]; ROOMS_VERTICAL]) -> bool {
-        for c in 0..ROOMS_VERTICAL {
-            for r in 0..ROOMS_HORIZONTAL {
-                if rooms[c][r].kind != RoomType::EmptyRoom {
-                    let mut connected = 0;
-                    for c1 in 0..ROOMS_VERTICAL {
-                        if rooms[c1][r].kind != RoomType::EmptyRoom {
-                            connected += 1;
-                        }
-                    }
-                    for r1 in 0..ROOMS_HORIZONTAL {
-                        if rooms[c][r1].kind != RoomType::EmptyRoom {
-                            connected += 1;
-                        }
-                    }
-                    if connected <= 2 {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-    pub fn render(&self) -> Level {
-        let mut rng = rand::thread_rng();
-        let mut s = [[LevelElement::Wall; 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;
-        let mut end_y: usize = 0;
-        for c in 0..ROOMS_VERTICAL {
-            for r in 0..ROOMS_HORIZONTAL {
-                let top = 1 + r * ROOM_HEIGHT;
-                let left = 1 + c * ROOM_WIDTH;
-                let room = self.rooms[c][r];
-                for x in 0..room.width {
-                    for y in 0..room.height {
-                        s[left + room.offset_x + x][top + room.offset_y + y] = LevelElement::Floor;
-                    }
-                }
-                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);
-                    s[t_x][t_y] = LevelElement::Chest{gold: rng.gen_range(2..100)};
-                }
-                if 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);
-                }
-                if room.kind == RoomType::StairDown {
-                    s[end_x][end_y] = LevelElement::StairDown;
-                }
-                if room.kind == RoomType::End {
-                    s[end_x][end_y] = LevelElement::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);
-                }
-                if room.kind == RoomType::StairUp {
-                    s[start_x][start_y] = LevelElement::StairUp;
-                }
-                if room.kind == RoomType::Start {
-                    s[start_x][start_y] = LevelElement::Start;
-                }
-            }
-        }
-        //
-        for c in 0..ROOMS_VERTICAL {
-            for r in 0..ROOMS_HORIZONTAL {
-                let src_room = self.rooms[c][r];
-                if let Some(x_conn) = src_room.connection_down {
-                    let tgt_room = self.rooms[c][r + x_conn.distance];
-                    let top = 1 + r * ROOM_HEIGHT + src_room.offset_y;
-                    let left = 1 + c * ROOM_WIDTH + x_conn.offset;
-                    let bottom = 1 + (r + x_conn.distance) * ROOM_HEIGHT + tgt_room.offset_y + tgt_room.height;
-                    for i in top..bottom {
-                        if s[left][i] == LevelElement::Wall {
-                            s[left][i] = LevelElement::Floor;
-                        }
-                    }
-                }
-                if let Some(y_conn) = src_room.connection_right {
-                    let tgt_room = self.rooms[c + y_conn.distance][r];
-
-                    let top = 1 + r * ROOM_HEIGHT + src_room.offset_y + y_conn.offset - 1;
-                    let left = 1 + c * ROOM_WIDTH + src_room.offset_x;
-                    let right = 1 + (c + y_conn.distance) * ROOM_WIDTH + tgt_room.offset_x + tgt_room.width;
-                    for i in left..right {
-                        if s[i][top] == LevelElement::Wall {
-                            s[i][top] = LevelElement::Floor;
-                        }
-                    }
-                }
-            }
-        }
-        Level {
-            structure: s,
-            discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH],
-            start_x,
-            start_y,
-            end_x,
-            end_y,
-        }
-    }
-}
-
-#[test]
-fn test_level_gen() {
-    let level = LevelGenerator::generate(0);
-    println!("{:?}", level);
-    assert_eq!(1, 2);
-}

src/level_widget.rs

@@ -1,169 +0,0 @@
-use ratatui::prelude::*;
-use ratatui::widgets::Widget;
-
-use crate::game::Game;
-use crate::level::{Level, LevelElement};
-
-const FG_BROWN: Color = Color::Rgb(186, 74, 0);
-
-pub struct LevelWidget<'a> {
-    pub game: &'a Game,
-}
-
-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).
-            set_symbol(symbol).
-            set_bg(bg).
-            set_fg(fg);
-    }
-
-    fn calculate_wall(top: Option<LevelElement>, right: Option<LevelElement>, bottom: Option<LevelElement>, left: Option<LevelElement>) -> String {
-        let mut val = 0;
-        val += match top {
-            Some(n) => {
-                match n {
-                    LevelElement::Wall => 1,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        val += match right {
-            Some(n) => {
-                match n {
-                    LevelElement::Wall => 2,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        val += match bottom {
-            Some(n) => {
-                match n {
-                    LevelElement::Wall => 4,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        val += match left {
-            Some(n) => {
-                match n {
-                    LevelElement::Wall => 8,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        [
-            "╋", "┃", "━", "┗",
-            "┃", "┃", "┏", "┣",
-            "━", "┛", "━", "┻",
-            "┓", "┫", "┳", "╋",
-        ][val].to_string()
-    }
-}
-
-impl<'a> Widget for LevelWidget<'a> {
-    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()];
-
-        let al: u16 = area.left();
-        let at: u16 = area.top();
-
-        // draw the level elements
-        for x in al..area.right() {
-            for y in at..area.bottom() {
-                let level_x = (x - al) as i16;
-                let level_y = (y - at) as i16;
-                match level.get_element(level_x, level_y) {
-                    None => {}
-                    Some(e) => {
-                        match e {
-                            LevelElement::Wall => {
-                                let top = level.get_element(level_x, level_y - 1);
-                                let right = level.get_element(level_x + 1, level_y);
-                                let bottom = level.get_element(level_x, level_y + 1);
-                                let left = level.get_element(level_x - 1, level_y);
-                                let symbol = LevelWidget::calculate_wall(top, right, bottom, left);
-                                self.set_cell(buf, x, y, symbol.as_str(), FG_BROWN, Color::Gray);
-                            }
-                            LevelElement::Floor => {
-                                self.set_cell(buf, x, y, " ", FG_BROWN, Color::Gray);
-                            }
-                            LevelElement::StairDown => {
-                                self.set_cell(buf, x, y, ">", Color::Black, Color::Gray);
-                            }
-                            LevelElement::StairUp => {
-                                self.set_cell(buf, x, y, "<", Color::Black, Color::Gray);
-                            }
-                            LevelElement::Unknown => {
-                                self.set_cell(buf, x, y, "▒", Color::DarkGray, Color::Gray);
-                            }
-                            LevelElement::Chest{gold} => {
-                                self.set_cell(buf, x, y, "⌂", Color::Black, Color::Gray);
-                            }
-                            LevelElement::Start => {
-                                self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
-                            }
-                            LevelElement::End => {
-                                self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // 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(LevelElement::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, "┓");
-}
-

src/main.rs

@@ -1,115 +1,19 @@
-use std::io::{Result, stdout};
-
-use crossterm::{
-    event::{self, KeyCode, KeyEventKind},
-    ExecutableCommand,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
-};
-use ratatui::{
-    prelude::{CrosstermBackend, Stylize, Terminal},
-    widgets::Paragraph,
-};
-use ratatui::prelude::*;
-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::player::Player;
 
 mod game;
 mod player;
 mod level;
 mod position;
-mod level_widget;
+mod monster;
-mod level_generator;
+mod artifacts;
 
-fn main() -> Result<()> {
+fn main() {
-    let mut levels: [Level; 25] = [Level::new(); 25];
+    let mut p = Player::new("Teddy Tester", 10);
-    for l in 0..25 {
+    let g = Game::new(&mut p);
-        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);
+    println!("{}",g.player.get_name());
-
+    println!("{}",g.player.get_life());
-    stdout().execute(EnterAlternateScreen)?;
+    g.player.change_life(-1);
-    enable_raw_mode()?;
+    println!("{}",g.player.get_life());
-    let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
-    terminal.clear()?;
-
-    loop {
-        terminal.draw(|frame| {
-            let mut area = frame.size();
-            frame.render_widget(Block::default().style(Style::default().bg(Color::Green)), area);
-
-            if area.width > 80 {
-                area.x = (area.width - 80) / 2;
-                area.width = 80;
-            }
-            if area.height > 25 {
-                area.y = (area.height - 25) / 2;
-                area.height = 25;
-            }
-
-            let map_area = Rect {
-                x: area.x,
-                y: area.y,
-                width: level::LEVEL_WIDTH as u16,
-                height: level::LEVEL_HEIGHT as u16,
-            };
-            frame.render_widget(LevelWidget { game: &g }, map_area);
-
-            let stats_area = Rect {
-                x: area.x + 50,
-                y: area.y,
-                width: 30,
-                height: 25,
-            };
-            frame.render_widget(
-                Paragraph::new(format!("{}\nHealth: {}/{}\nGold: {}\n{}/{}/{}",
-                                       g.player.get_name(),
-                                       g.player.get_life(),
-                                       g.player.get_max_life(),
-                                       g.player.get_gold(),
-                                       g.player.get_position().get_level(),
-                                       g.player.get_position().get_x(),
-                                       g.player.get_position().get_y()))
-                    .white()
-                    .on_blue(),
-                stats_area,
-            );
-        })?;
-        if event::poll(std::time::Duration::from_millis(16))? {
-            if let event::Event::Key(key) = event::read()? {
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
-                    break;
-                }
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('d') {
-                    ;
-                }
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Left {
-                    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);
-                }
-            }
-        }
-    }
-
-    stdout().execute(LeaveAlternateScreen)?;
-    disable_raw_mode()?;
-    Ok(())
 }

src/monster.rs

@@ -0,0 +1,51 @@
+use crate::position::Position;
+
+pub struct Monster {
+    life: usize,
+    position: Position,
+}
+
+impl Monster {
+    pub fn new(life: usize) -> Self {
+        Monster {
+            life,
+            position: Position::new(0, 0, 0),
+        }
+    }
+    pub fn get_life(&self) -> usize { self.life }
+    pub fn is_dead(&self) -> bool { self.life <= 0 }
+    pub fn decrease_life(&mut self, by: usize) {
+        self.life = self.life.saturating_sub(by);
+    }
+    pub fn get_position(&mut self) -> &mut Position {
+        &mut self.position
+    }
+    pub fn get_immutable_position(&self) -> &Position {
+        &self.position
+    }
+}
+
+#[test]
+fn monsters_can_move() {
+    let mut m = Monster::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 = Monster::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

@@ -1,49 +1,42 @@
 use std::cmp::{max, min};
-
 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: usize) -> Player {
+    pub fn new(name: &str, max_life: i16) -> 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 get_life(&self) -> usize { self.life }
-    pub fn get_max_life(&self) -> usize { self.max_life }
-    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,
+        self.life = max(0, min(self.max_life, self.life + by));
-                        min(self.max_life,
-                            (self.life as i16 + by) as usize,
-                        ),
-        );
     }
-    pub fn get_position(&self) -> Position {
+    pub fn get_life(&self) -> i16 {
-        self.position
+        self.life
     }
-    pub fn change_position(&mut self, dx: i16, dy: i16) {
+    pub fn get_position(&mut self) -> &mut Position {
-        self.position.change(dx, dy);
+        &mut self.position
     }
 
-    pub fn set_position(&mut self, level: usize, x: usize, y: usize) {
+    /// add the given amount to the players gold stash
-        self.position.set(level, x, y);
+    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 }
 }
 
 #[test]
@@ -53,10 +46,21 @@ fn test_get_name() {
         position: Position::new(0, 1, 1),
         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 {
@@ -64,6 +68,7 @@ fn test_change_life() {
         position: Position::new(0, 1, 1),
         life: 5,
         max_life: 10,
+        gold: 0,
     };
     assert_eq!(p.life, 5);
     p.change_life(-2);
@@ -73,3 +78,16 @@ fn test_change_life() {
     p.change_life(-12);
     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));
+}

src/position.rs

@@ -1,4 +1,4 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(PartialEq, Debug)]
 pub struct Position {
     level: usize,
     x: usize,
@@ -13,7 +13,17 @@ impl Position {
             y,
         }
     }
-    pub fn get_level(&self) -> usize{
+    pub fn change(&mut self, dx: i16, dy: i16) {
+        self.x = ((self.x as i16) + dx) as usize;
+        self.y = ((self.y as i16) + dy) as usize;
+    }
+    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
     }
 
@@ -21,17 +31,5 @@ impl Position {
         self.x
     }
 
-    pub fn get_y(&self) -> usize {
+    pub fn get_y(&self) -> usize { self.y }
-        self.y
-    }
-
-    pub fn change(&mut self, dx: i16, dy: i16) {
-        self.x = ((self.x as i16) + dx) as usize;
-        self.y = ((self.y as i16) + dy) as usize;
-    }
-    pub fn set(&mut self, level: usize, x: usize, y:usize) {
-        self.level = level;
-        self.x = x;
-        self.y = y;
-    }
 }