clean up

rooms work, connections are missing

.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

@@ -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,24 +86,10 @@ 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"
@@ -137,16 +117,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 +132,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "js-sys"
-version = "0.3.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.149"
@@ -249,16 +210,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"
@@ -451,80 +402,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.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
-
-[[package]]
-name = "web-sys"
-version = "0.3.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
-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

@@ -9,5 +9,3 @@ edition = "2021"
 ratatui = "0.24.0"
 crossterm = "0.27.0"
 rand = "0.8.5"
-petgraph = "0.6.4"
-whoami = "1.4.1"

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,30 @@
-use crate::level::{Level, StructureElement};
+use crate::level::{Level, LevelElement};
-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: i8, dy: i8) {
-        let mut v: Vec<Level> = Vec::with_capacity(LEVELS);
+        // check if move is allowed first
-        for d in 0..LEVELS {
+        let player = &self.player;
-            v.push(LevelGenerator::generate(d, d == 0, d == LEVELS - 1).render());
+        let player_pos = player.get_position();
-        }
+        let level = &self.levels[player_pos.get_level() as usize];
-        let mut g = Game {
+        let new_x = ((player_pos.get_x() as i16) + dx as i16) as u16;
-            player: p,
+        let new_y = ((player_pos.get_y() as i16) + dy as i16) as u16;
-            levels: v,
+        let can_go: bool = match level.get_element(new_x as i16, new_y as i16) {
-        };
+            None => { false }
-        let start = {
+            Some(t) => {
-            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()];
-        match level.get_element(new_x, new_y) {
-            (None, _, _) => { return false; }
-            (Some(t), _, _) => {
                 match t {
-                    StructureElement::Wall => { return false; }
+                    LevelElement::Wall => { false }
-                    _ => {}
+                    _ => { true }
                 }
             }
         };
-        true
+        if can_go {
-    }
+            self.player.change_position(dx, dy);
-    /// returns the position (as tuple) of the next level's start point.
-    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, x, y) = self.next_start();
-                        player_level = next_level;
-                        self.get_mutable_player().get_position().set(next_level, x, y);
-                    }
-                    StructureElement::StairUp => {
-                        (dx, dy) = (0, 0);
-                        let (next_level, x, y) = self.prev_end();
-                        player_level = next_level;
-                        self.get_mutable_player().get_position().set(next_level, x, y);
-                    }
-                    _ => {}
-                }
-            }
-            _ => {}
-        }
-
-        // 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
-    }
-    pub fn player_collects_artifact(&mut self) {
-        let player_pos = &self.player.get_immutable_position();
-        let player_level = player_pos.get_level();
-        let level = &mut self.levels[player_level];
-        let (_, _, a) = level.get_element(player_pos.get_x() as i16, player_pos.get_y() as i16);
-        match a {
-            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,285 +1,56 @@
-use std::cmp::{max, min};
-
-#[cfg(test)]
-use crate::artifacts::{Chest, Potion};
-use crate::artifacts::Artifact;
-use crate::monster::Monster;
-#[cfg(test)]
-use crate::monster::Rat;
-use crate::position::Position;
-
 pub const LEVEL_WIDTH: usize = 50;
 pub const LEVEL_HEIGHT: usize = 25;
 
 #[derive(Copy, Clone, Debug, PartialEq)]
-pub enum StructureElement {
+pub enum LevelElement {
-    Start,
-    End,
     Wall,
     Floor,
     StairDown,
     StairUp,
-    Unknown,
 }
 
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum RoomType {
+    Start,
+    End,
+    StairUp,
+    StairDown,
+    BasicRoom,
+    EmptyRoom,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Level {
-    pub(crate) level: usize,
+    pub(crate) structure: [[LevelElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
-    pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) start_x: usize,
-    pub(crate) discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) start_y: usize,
-    pub(crate) monsters: Vec<Box<dyn Monster>>,
-    pub(crate) artifacts: Vec<Box<dyn Artifact>>,
-    /// the position of the start in the level (either stair up or start point)
-    pub(crate) start: (usize, usize),
-    /// the position of the end in the level (either stair down or end point)
-    pub(crate) end: (usize, usize),
 }
 
 impl Level {
-    #[cfg(test)]
+    pub fn new() -> Level {
-    pub fn new(level: usize) -> Level {
+        let mut 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),
-            start: (0, 0),
-            end: (0, 0),
         }
     }
-    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 fn get_element(&self, x: i16, y: i16) -> Option<LevelElement> {
         if x < 0 || y < 0 {
-            return (None, None, None);
+            return None;
         }
-        let x = x as usize;
+        if x >= LEVEL_WIDTH as i16 || y >= LEVEL_HEIGHT as i16 {
-        let y = y as usize;
+            return None;
-        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
-            return (None, 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;
-        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) {
-        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] == 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] == 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] == 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] == StructureElement::Wall {
-                break;
-            }
-        }
-    }
-
-    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;
-            }
         }
+        Some(self.structure[x as usize][y as usize])
     }
 }
 
 #[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).unwrap(), LevelElement::Wall);
-    assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Unknown);
+    assert_eq!(l.get_element(4, 4).unwrap(), LevelElement::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).unwrap(), LevelElement::Wall);
-    assert_eq!(l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16).0, None);
+    assert_eq!(l.get_element(50, 25), 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

@@ -1,52 +1,23 @@
-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::artifacts::{Artifact, Chest, Potion};
+use crate::level::{Level, LevelElement, RoomType};
-use crate::level::{Level, StructureElement};
-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 {
-    Start,
-    End,
-    StairUp,
-    StairDown,
-    BasicRoom,
-    TreasureRoom,
-    MonsterRoom,
-    EmptyRoom,
-}
-
-#[derive(Copy, Clone)]
-struct ConnectionInfo {
-    offset: usize,
-    distance: usize,
-}
-
-#[derive(Copy, Clone)]
 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_down: bool,
-    pub connection_right: Option<ConnectionInfo>,
+    pub connection_right: bool,
+    pub connected: bool,
 }
 
 impl Room {
@@ -57,200 +28,93 @@ impl Room {
             offset_y: 0,
             width: 0,
             height: 0,
-            connection_down: None,
+            connection_down: false,
-            connection_right: None,
+            connection_right: false,
+            connected: false,
         }
     }
-    /// 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],
-    level: usize,
 }
 
 impl LevelGenerator {
-    pub fn generate(level: usize, first: bool, last: bool) -> Self {
+    pub fn generate(level: usize) -> Self {
+        let mut room_types: Vec<RoomType> = Vec::with_capacity(ROOMS_HORIZONTAL * ROOMS_VERTICAL);
+        if level > 0 {
+            room_types.push(RoomType::StairUp);
+        } else {
+            room_types.push(RoomType::Start);
+        }
+        if level < 24 {
+            room_types.push(RoomType::StairDown);
+        } else {
+            room_types.push(RoomType::End);
+        }
         let mut rng = rand::thread_rng();
-        let mut rooms = [[Room::new(); ROOMS_HORIZONTAL]; ROOMS_VERTICAL];
+        for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL {
-        let mut graph = UnGraph::<(usize, usize), u16>::default();
+            match rng.gen_range(1..=6) {
-
+                1..=3 => { room_types.push(RoomType::EmptyRoom) }
-        // trick the room_connectable function into failing on the first iteration
+                _ => { room_types.push(RoomType::BasicRoom) }
-        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 first {
-                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 {
-                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) {
-                    // TODO tune room type distribution
-                    1..=33 => { room_types.push(RoomType::EmptyRoom) }
-                    34..=66 => { room_types.push(RoomType::TreasureRoom) }
-                    67..=90 => { room_types.push(RoomType::MonsterRoom) }
-                    _ => { 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));
-                    }
-                }
             }
         }
+        room_types.shuffle(&mut rng);
 
-        // add edges to the graph connecting each room to all of its neighbours (max 4 of them)
+        let mut rooms = [[Room::new(); ROOMS_HORIZONTAL]; ROOMS_VERTICAL];
-        for c in 0..ROOMS_VERTICAL {
+        for r in 0..ROOMS_VERTICAL {
-            for r in 0..ROOMS_HORIZONTAL {
+            for c in 0..ROOMS_HORIZONTAL {
-                if rooms[c][r].kind == RoomType::EmptyRoom {
+                rooms[r][c].kind = room_types.pop().unwrap();
+                if rooms[r][c].kind != RoomType::EmptyRoom {
+                    let width = rng.gen_range(3..6);
+                    let height = rng.gen_range(3..5);
+                    rooms[r][c].width = width;
+                    rooms[r][c].height = height;
+                    rooms[r][c].offset_x = rng.gen_range(0..(ROOM_WIDTH - width));
+                    rooms[r][c].offset_y = rng.gen_range(0..(ROOM_HEIGHT - height));
+                }
+                if r == ROOMS_HORIZONTAL - 1 || c == ROOMS_HORIZONTAL - 1 {
                     continue;
                 }
-                let src_index = graph.node_indices().find(|i| graph[*i] == (c, r)).unwrap();
+                match rng.gen_range(0..3) {
-                for r_1 in r + 1..ROOMS_HORIZONTAL {
+                    0 => { rooms[r][c].connection_down = true }
-                    if rooms[c][r_1].kind != RoomType::EmptyRoom {
+                    1 => { rooms[r][c].connection_right = true }
-                        let tgt_index = graph.node_indices().find(|i| graph[*i] == (c, r_1)).unwrap();
+                    2 => {
-                        // todo use random weight for edge
+                        rooms[r][c].connection_down = true;
-                        graph.add_edge(src_index, tgt_index, 1);
+                        rooms[r][c].connection_down = true
-                        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 mut unconnected_rooms = 0;//ROOMS_HORIZONTAL * ROOMS_VERTICAL - 1;
-        let mst: Graph<(usize, usize), u16, petgraph::Undirected> = Graph::from_elements(min_spanning_tree(&graph));
+        rooms[0][0].connected = true;
-        for edge in mst.raw_edges() {
+        for r in 0..ROOMS_VERTICAL {
-            let src = mst[edge.source()];
+            for c in 0..ROOMS_HORIZONTAL {
-            let tgt = mst[edge.target()];
+                if !rooms[r][c].connected {
-
+                    continue;
-            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 {
+                if rooms[r][c].connection_right {
-                    // src to tgt
+                    rooms[r][c + 1].connected = true;
-                    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 });
                 }
-            }
+                if rooms[r][c].connection_down {
-            // rows are the same, either left or right
+                    rooms[r + 1][c].connected = true;
-            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 });
                 }
             }
         }
+        println!("Unconnected: {}", unconnected_rooms);
 
         LevelGenerator {
-            rooms,
+            rooms
-            level,
         }
     }
-
-    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 structure = [[StructureElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
+        let mut s = [[LevelElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
-        let mut artifacts: Vec<Box<dyn Artifact>> = Vec::with_capacity(10);
-        let mut enemies: Vec<Box<dyn Monster>> = Vec::with_capacity(10);
         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;
@@ -258,103 +122,32 @@ impl LevelGenerator {
                 let room = self.rooms[c][r];
                 for x in 0..room.width {
                     for y in 0..room.height {
-                        structure[left + room.offset_x + x][top + room.offset_y + y] = StructureElement::Floor;
+                        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);
-                    // TODO randomize artifacts
-                    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) {
-                        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::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);
-                }
                 if room.kind == RoomType::StairDown {
-                    structure[end_x][end_y] = StructureElement::StairDown;
+                    s[left + room.offset_x + rng.gen_range(0..room.width)][top + room.offset_y + rng.gen_range(0..room.height)] = LevelElement::StairDown;
                 }
-                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);
                 }
                 if room.kind == RoomType::StairUp {
-                    structure[start_x][start_y] = StructureElement::StairUp;
+                    s[start_x][start_y] = LevelElement::StairUp;
-                }
-                if room.kind == RoomType::Start {
-                    structure[start_x][start_y] = StructureElement::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 structure[left][i] == StructureElement::Wall {
-                            structure[left][i] = StructureElement::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 structure[i][top] == StructureElement::Wall {
-                            structure[i][top] = StructureElement::Floor;
-                        }
-                    }
                 }
             }
         }
         Level {
-            level: self.level,
+            structure: s,
-            structure,
+            start_x,
-            discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH],
+            start_y,
-            monsters: enemies,
-            artifacts,
-            start: (start_x, start_y),
-            end: (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,16 @@
-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::{Level, LevelElement};
+use crate::player::Player;
 
 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,76 +18,138 @@ impl LevelWidget {
             set_bg(bg).
             set_fg(fg);
     }
-}
 
-impl StatefulWidget for LevelWidget {
+    fn calculate_wall(top: Option<LevelElement>, right: Option<LevelElement>, bottom: Option<LevelElement>, left: Option<LevelElement>) -> String {
-    type State = Game;
+        let mut val = 0;
-
+        val += match top {
-    fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
+            Some(n) => {
-        let al: u16 = area.left();
+                match n {
-        let at: u16 = area.top();
+                    LevelElement::Wall => 1,
-
+                    _ => 0
-        {
-            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) => {
-                            match structure_element {
-                                StructureElement::Start => {
-                                    self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
-                                }
-                                StructureElement::End => {
-                                    self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
-                                }
-                                StructureElement::Wall => {
-                                    // TODO add fancy walls
-                                    self.set_cell(buf, x, y, "#", FG_BROWN, Color::Gray);
-                                }
-                                StructureElement::Floor => {
-                                    self.set_cell(buf, x, y, " ", FG_BROWN, Color::Gray);
-                                }
-                                StructureElement::StairDown => {
-                                    self.set_cell(buf, x, y, ">", Color::Black, Color::Gray);
-                                }
-                                StructureElement::StairUp => {
-                                    self.set_cell(buf, x, y, "<", Color::Black, Color::Gray);
-                                }
-                                StructureElement::Unknown => {
-                                    self.set_cell(buf, x, y, "▒", Color::DarkGray, Color::Gray);
-                                }
-                            }
-                        }
-                        (_, Some(m), _) => {
-                            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) => {}
-                    };
                 }
             }
-        }
+            None => 0
-        {
+        };
-            let player = state.get_mutable_player();
+        val += match right {
-            let player_pos = player.get_immutable_position();
+            Some(n) => {
-            let player_x = al + player_pos.get_x() as u16;
+                match n {
-            let player_y = at + player_pos.get_y() as u16;
+                    LevelElement::Wall => 2,
-            self.set_cell(buf, player_x, player_y, "8", Color::Red, Color::Gray);
+                    _ => 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 Widget for LevelWidget {
+impl<'a> Widget for LevelWidget<'a> {
-    fn render(self, _area: Rect, _buf: &mut Buffer) {}
+    fn render(self, area: Rect, buf: &mut Buffer) {
+        let player = &self.game.player;
+        let player_pos = player.get_position();
+        let level = &self.game.levels[player_pos.get_level() as usize];
+
+        let al = area.left();
+        let at = 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, ">", FG_BROWN, Color::Gray);
+                            }
+                            LevelElement::StairUp => {
+                                self.set_cell(buf, x, y, "<", FG_BROWN, Color::Gray);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // draw player
+        self.set_cell(buf, al + player_pos.get_x(), at + player_pos.get_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,23 +1,21 @@
-use std::io::Result;
-use std::io::stdout;
-
 use crossterm::{
     event::{self, KeyCode, KeyEventKind},
-    ExecutableCommand,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+    ExecutableCommand,
 };
 use ratatui::{
     prelude::{CrosstermBackend, Stylize, Terminal},
     widgets::Paragraph,
 };
+use std::io::{stdout, Result};
 use ratatui::prelude::*;
 use ratatui::widgets::Block;
-use whoami::realname;
 
 use crate::game::Game;
+use crate::level::{Level, LevelElement};
 use crate::level_widget::LevelWidget;
-// use crate::level_widget::LevelWidget;
 use crate::player::Player;
+use crate::level_generator::LevelGenerator;
 
 mod game;
 mod player;
@@ -25,12 +23,18 @@ 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("Teddy Tester", 10),
+        levels,
+    };
+
+    g.player.change_position((levels[0].start_x) as i8, (levels[0].start_y) as i8);
 
     stdout().execute(EnterAlternateScreen)?;
     enable_raw_mode()?;
@@ -57,7 +61,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,
@@ -66,12 +70,13 @@ fn main() -> Result<()> {
                 height: 25,
             };
             frame.render_widget(
-                Paragraph::new(format!("{}\nHealth: {}/{}\nGold: {}\nLevel: {}",
+                Paragraph::new(format!("{}\nHealth: {}/{}\n{}/{}/{}",
-                                       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_position().get_level(),
-                                       game.get_player().get_immutable_position().get_level()))
+                                       g.player.get_position().get_x(),
+                                       g.player.get_position().get_y()))
                     .white()
                     .on_blue(),
                 stats_area,
@@ -82,20 +87,17 @@ 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::Left {
-                    let new_pos = match key.code {
+                    g.move_player(-1, 0);
-                        KeyCode::Left => { game.move_player(-1, 0) }
+                }
-                        KeyCode::Right => { game.move_player(1, 0) }
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Right {
-                        KeyCode::Up => { game.move_player(0, -1) }
+                    g.move_player(1, 0);
-                        KeyCode::Down => { game.move_player(0, 1) }
+                }
-                        _ => { (0, 0) }
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Up {
-                    };
+                    g.move_player(0, -1);
-                    if !game.player_fights_monster() {
+                }
-                        // player attacked monster but did not kill it
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Down {
-                        game.move_player(new_pos.0, new_pos.1);
+                    g.move_player(0, 1);
-                    }
-                    game.player_collects_artifact();
-                    game.update_level();
                 }
             }
         }

src/monster.rs

@@ -1,122 +0,0 @@
-use ratatui::prelude::Color;
-
-use crate::position::Position;
-
-pub trait Monster {
-    fn is_dead(&self) -> bool;
-    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 {
-    #[cfg(test)]
-    pub fn new(life: usize) -> Self {
-        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 }
-}
-default_monster!(Rat);
-
-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

@@ -1,5 +1,4 @@
 use std::cmp::{max, min};
-
 use crate::position::Position;
 
 pub struct Player {
@@ -7,7 +6,6 @@ pub struct Player {
     position: Position,
     life: i16,
     max_life: i16,
-    gold: usize,
 }
 
 impl Player {
@@ -17,33 +15,22 @@ impl Player {
             position: Position::new(0, 0, 0),
             life: max_life,
             max_life,
-            gold: 0,
         }
     }
     pub fn get_name(&self) -> String {
         return self.name.clone();
     }
+    pub fn get_life(&self) -> i16 { self.life }
+    pub fn get_max_life(&self) -> i16 { self.max_life }
     pub fn change_life(&mut self, by: i16) {
         self.life = max(0, min(self.max_life, self.life + by));
     }
-    pub fn get_life(&self) -> i16 {
+    pub fn get_position(&self) -> Position {
-        self.life
+        self.position
     }
-    pub fn get_max_life(&self) -> i16 {
+    pub fn change_position(&mut self, dx: i8, dy: i8) {
-        self.max_life
+        self.position.change(dx, dy);
     }
-    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 }
 }
 
 #[test]
@@ -53,21 +40,10 @@ 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 {
@@ -75,39 +51,12 @@ fn test_change_life() {
         position: Position::new(0, 1, 1),
         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,68 +1,32 @@
-use std::cmp::max;
+#[derive(Copy, Clone, Debug, PartialEq)]
-
-#[derive(PartialEq, Debug)]
 pub struct Position {
-    level: usize,
+    level: u8,
-    x: usize,
+    x: u16,
-    y: usize,
+    y: u16,
 }
 
 impl Position {
-    pub fn new(level: usize, x: usize, y: usize) -> Self {
+    pub fn new(level: u8, x: u16, y: u16) -> Self {
         Self {
             level,
             x,
             y,
         }
     }
-    pub fn change(&mut self, dx: i16, dy: i16) -> (usize, usize) {
+    pub fn get_level(&self) -> u8 {
-        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
     }
 
-    pub fn get_x(&self) -> usize {
+    pub fn get_x(&self) -> u16 {
         self.x
     }
 
-    pub fn get_y(&self) -> usize { self.y }
+    pub fn get_y(&self) -> u16 {
-}
+        self.y
-
+    }
-#[test]
+
-fn test_position_change() {
+    pub fn change(&mut self, dx: i8, dy: i8) {
-    let mut p = Position::new(0, 10, 10);
+        self.x = ((self.x as i16) + dx as i16) as u16;
-
+        self.y = ((self.y as i16) + dy as i16) as u16;
-    let res = p.change(-1, 1);
+    }
-    assert_eq!(res, (9, 11));
-    assert_eq!(p.get_x(), 9);
-    assert_eq!(p.get_y(), 11);
-
-    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);
 }