Implement chest experiment one

fixing imports and stuff

Cargo.lock

@@ -38,6 +38,12 @@ 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"
@@ -86,10 +92,24 @@ 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"
@@ -117,6 +137,16 @@ 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"
@@ -132,6 +162,15 @@ 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"
@@ -210,6 +249,16 @@ 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"
@@ -402,6 +451,80 @@ 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

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

src/game.rs

@@ -7,14 +7,14 @@ pub struct Game {
 }
 
 impl Game {
-    pub fn move_player(&mut self, dx: i8, dy: i8) {
+    pub fn move_player(&mut self, dx: i16, dy: i16) {
         // check if move is allowed first
         let player = &self.player;
         let player_pos = player.get_position();
-        let level = &self.levels[player_pos.get_level() as usize];
+        let level = &self.levels[player_pos.get_level()];
-        let new_x = ((player_pos.get_x() as i16) + dx as i16) as u16;
+        let new_x: i16 = player_pos.get_x() as i16 + dx;
-        let new_y = ((player_pos.get_y() as i16) + dy as i16) as u16;
+        let new_y: i16 = player_pos.get_y() as i16 + dy;
-        let can_go: bool = match level.get_element(new_x as i16, new_y as i16) {
+        let can_go: bool = match level.get_element(new_x, new_y) {
             None => { false }
             Some(t) => {
                 match t {
@@ -24,7 +24,31 @@ impl Game {
             }
         };
         if can_go {
-            self.player.change_position(dx, dy);
+            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,3 +1,6 @@
+use std::cmp::{max, min};
+use crate::position::Position;
+
 pub const LEVEL_WIDTH: usize = 50;
 pub const LEVEL_HEIGHT: usize = 25;
 
@@ -7,6 +10,10 @@ pub enum LevelElement {
     Floor,
     StairDown,
     StairUp,
+    Start,
+    End,
+    Chest { gold: usize },
+    Unknown,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq)]
@@ -16,33 +23,79 @@ pub enum RoomType {
     StairUp,
     StairDown,
     BasicRoom,
+    TreasureRoom,
     EmptyRoom,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Level {
     pub(crate) structure: [[LevelElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
     pub(crate) start_x: usize,
     pub(crate) start_y: usize,
+    pub(crate) end_x: usize,
+    pub(crate) end_y: usize,
 }
 
 impl Level {
     pub fn new() -> Level {
-        let mut s = [[LevelElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
+        let s = [[LevelElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
         Level {
             structure: s,
+            discovered: [[false; LEVEL_HEIGHT]; LEVEL_WIDTH],
             start_x: 1,
             start_y: 1,
+            end_x: 1,
+            end_y: 1,
         }
     }
     pub fn get_element(&self, x: i16, y: i16) -> Option<LevelElement> {
         if x < 0 || y < 0 {
             return None;
         }
-        if x >= LEVEL_WIDTH as i16 || y >= LEVEL_HEIGHT as i16 {
+        let x = x as usize;
+        let y = y as usize;
+        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
             return None;
         }
-        Some(self.structure[x as usize][y as usize])
+        if self.discovered[x][y] {
+            return Some(self.structure[x][y]);
+        }
+        return Some(LevelElement::Unknown);
+    }
+    /// 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();
+        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;
+            }
+        }
+        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 {
+                break;
+            }
+        }
+        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 {
+                break;
+            }
+        }
+        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 {
+                break;
+            }
+        }
+        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 {
+                break;
+            }
+        }
     }
 }
 

src/level_generator.rs

@@ -1,5 +1,13 @@
+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};
 
@@ -8,6 +16,12 @@ 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,
@@ -15,9 +29,9 @@ struct Room {
     pub offset_y: usize,
     pub width: usize,
     pub height: usize,
-    pub connection_down: bool,
+    pub connection_down: Option<ConnectionInfo>,
-    pub connection_right: bool,
+    pub connection_right: Option<ConnectionInfo>,
-    pub connected: bool,
+    // pub connected: bool,
 }
 
 impl Room {
@@ -28,11 +42,25 @@ impl Room {
             offset_y: 0,
             width: 0,
             height: 0,
-            connection_down: false,
+            connection_down: None,
-            connection_right: false,
+            connection_right: None,
-            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)]
@@ -42,79 +70,166 @@ pub struct LevelGenerator {
 
 impl LevelGenerator {
     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();
-        for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL {
-            match rng.gen_range(1..=6) {
-                1..=3 => { room_types.push(RoomType::EmptyRoom) }
-                _ => { room_types.push(RoomType::BasicRoom) }
-            }
-        }
-        room_types.shuffle(&mut rng);
-
         let mut rooms = [[Room::new(); ROOMS_HORIZONTAL]; ROOMS_VERTICAL];
-        for r in 0..ROOMS_VERTICAL {
+        let mut graph = UnGraph::<(usize, usize), u16>::default();
-            for c in 0..ROOMS_HORIZONTAL {
+
-                rooms[r][c].kind = room_types.pop().unwrap();
+        // trick the room_connectable function into failing on the first iteration
-                if rooms[r][c].kind != RoomType::EmptyRoom {
+        rooms[0][0].kind = RoomType::BasicRoom;
-                    let width = rng.gen_range(3..6);
+
-                    let height = rng.gen_range(3..5);
+        while !LevelGenerator::rooms_connectable(&rooms) {
-                    rooms[r][c].width = width;
+            let mut room_types: Vec<RoomType> = Vec::with_capacity(ROOMS_HORIZONTAL * ROOMS_VERTICAL);
-                    rooms[r][c].height = height;
+            // level 0 contains a start room, all others contain a stair up
-                    rooms[r][c].offset_x = rng.gen_range(0..(ROOM_WIDTH - width));
+            if level == 0 {
-                    rooms[r][c].offset_y = rng.gen_range(0..(ROOM_HEIGHT - height));
+                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) }
                 }
-                if r == ROOMS_HORIZONTAL - 1 || c == ROOMS_HORIZONTAL - 1 {
+            }
-                    continue;
+            room_types.shuffle(&mut rng);
-                }
+
-                match rng.gen_range(0..3) {
+            graph.clear();
-                    0 => { rooms[r][c].connection_down = true }
+            // place the rooms in the array an add nodes to the graph for every non empty room
-                    1 => { rooms[r][c].connection_right = true }
+            for c in 0..ROOMS_VERTICAL {
-                    2 => {
+                for r in 0..ROOMS_HORIZONTAL {
-                        rooms[r][c].connection_down = true;
+                    rooms[c][r].kind = room_types.pop().unwrap();
-                        rooms[r][c].connection_down = true
+                    if rooms[c][r].kind != RoomType::EmptyRoom {
+                        rooms[c][r].random(&mut rng);
+                        graph.add_node((c, r));
                     }
-                    _ => {}
                 }
             }
         }
 
-        let mut unconnected_rooms = 0;//ROOMS_HORIZONTAL * ROOMS_VERTICAL - 1;
+        // add edges to the graph connecting each room to all of its neighbours (max 4 of them)
-        rooms[0][0].connected = true;
+        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 {
-                if !rooms[r][c].connected {
                     continue;
                 }
-                if rooms[r][c].connection_right {
+                let src_index = graph.node_indices().find(|i| graph[*i] == (c, r)).unwrap();
-                    rooms[r][c + 1].connected = true;
+                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;
+                    }
                 }
-                if rooms[r][c].connection_down {
+                for c_1 in c + 1..ROOMS_VERTICAL {
-                    rooms[r + 1][c].connected = true;
+                    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 });
                 }
             }
         }
-        println!("Unconnected: {}", unconnected_rooms);
 
         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;
@@ -125,8 +240,20 @@ impl LevelGenerator {
                         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 {
-                    s[left + room.offset_x + rng.gen_range(0..room.width)][top + room.offset_y + rng.gen_range(0..room.height)] = LevelElement::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);
@@ -135,12 +262,47 @@ impl LevelGenerator {
                 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,
         }
     }
 }

src/level_widget.rs

@@ -1,8 +1,8 @@
 use ratatui::prelude::*;
 use ratatui::widgets::Widget;
+
 use crate::game::Game;
 use crate::level::{Level, LevelElement};
-use crate::player::Player;
 
 const FG_BROWN: Color = Color::Rgb(186, 74, 0);
 
@@ -70,10 +70,10 @@ 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 = &self.game.levels[player_pos.get_level() as usize];
+        let level: &Level = &self.game.levels[player_pos.get_level()];
 
-        let al = area.left();
+        let al: u16 = area.left();
-        let at = area.top();
+        let at: u16 = area.top();
 
         // draw the level elements
         for x in al..area.right() {
@@ -96,10 +96,22 @@ impl<'a> Widget for LevelWidget<'a> {
                                 self.set_cell(buf, x, y, " ", FG_BROWN, Color::Gray);
                             }
                             LevelElement::StairDown => {
-                                self.set_cell(buf, x, y, ">", FG_BROWN, Color::Gray);
+                                self.set_cell(buf, x, y, ">", Color::Black, Color::Gray);
                             }
                             LevelElement::StairUp => {
-                                self.set_cell(buf, x, y, "<", FG_BROWN, Color::Gray);
+                                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);
                             }
                         }
                     }
@@ -108,7 +120,9 @@ impl<'a> Widget for LevelWidget<'a> {
         }
 
         // draw player
-        self.set_cell(buf, al + player_pos.get_x(), at + player_pos.get_y(), "8", Color::Red, Color::Gray);
+        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);
     }
 }
 

src/main.rs

@@ -1,21 +1,23 @@
+use std::io::{Result, stdout};
+
 use crossterm::{
     event::{self, KeyCode, KeyEventKind},
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
     ExecutableCommand,
+    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 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::Level;
+use crate::level_generator::LevelGenerator;
 use crate::level_widget::LevelWidget;
 use crate::player::Player;
-use crate::level_generator::LevelGenerator;
 
 mod game;
 mod player;
@@ -30,11 +32,11 @@ fn main() -> Result<()> {
         levels[l] = LevelGenerator::generate(l).render();
     }
     let mut g = Game {
-        player: Player::new("Teddy Tester", 10),
+        player: Player::new(realname().as_str(), 10),
         levels,
     };
 
-    g.player.change_position((levels[0].start_x) as i8, (levels[0].start_y) as i8);
+    g.move_player(levels[0].start_x as i16, levels[0].start_y as i16);
 
     stdout().execute(EnterAlternateScreen)?;
     enable_raw_mode()?;
@@ -70,10 +72,11 @@ fn main() -> Result<()> {
                 height: 25,
             };
             frame.render_widget(
-                Paragraph::new(format!("{}\nHealth: {}/{}\n{}/{}/{}",
+                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()))
@@ -87,6 +90,9 @@ fn main() -> Result<()> {
                 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);
                 }

src/player.rs

@@ -1,18 +1,21 @@
 use std::cmp::{max, min};
+
 use crate::position::Position;
 
 pub struct Player {
     name: String,
     position: Position,
-    life: i16,
+    gold: usize,
-    max_life: i16,
+    life: usize,
+    max_life: usize,
 }
 
 impl Player {
-    pub fn new(name: &str, max_life: i16) -> Player {
+    pub fn new(name: &str, max_life: usize) -> Player {
         Player {
             name: name.to_string(),
             position: Position::new(0, 0, 0),
+            gold: 0,
             life: max_life,
             max_life,
         }
@@ -20,17 +23,27 @@ impl Player {
     pub fn get_name(&self) -> String {
         return self.name.clone();
     }
-    pub fn get_life(&self) -> i16 { self.life }
+    pub fn get_life(&self) -> usize { self.life }
-    pub fn get_max_life(&self) -> i16 { self.max_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, min(self.max_life, self.life + by));
+        self.life = max(0,
+                        min(self.max_life,
+                            (self.life as i16 + by) as usize,
+                        ),
+        );
     }
     pub fn get_position(&self) -> Position {
         self.position
     }
-    pub fn change_position(&mut self, dx: i8, dy: i8) {
+    pub fn change_position(&mut self, dx: i16, dy: i16) {
         self.position.change(dx, dy);
     }
+
+    pub fn set_position(&mut self, level: usize, x: usize, y: usize) {
+        self.position.set(level, x, y);
+    }
 }
 
 #[test]

src/position.rs

@@ -1,32 +1,37 @@
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Position {
-    level: u8,
+    level: usize,
-    x: u16,
+    x: usize,
-    y: u16,
+    y: usize,
 }
 
 impl Position {
-    pub fn new(level: u8, x: u16, y: u16) -> Self {
+    pub fn new(level: usize, x: usize, y: usize) -> Self {
         Self {
             level,
             x,
             y,
         }
     }
-    pub fn get_level(&self) -> u8 {
+    pub fn get_level(&self) -> usize{
         self.level
     }
 
-    pub fn get_x(&self) -> u16 {
+    pub fn get_x(&self) -> usize {
         self.x
     }
 
-    pub fn get_y(&self) -> u16 {
+    pub fn get_y(&self) -> usize {
         self.y
     }
 
-    pub fn change(&mut self, dx: i8, dy: i8) {
+    pub fn change(&mut self, dx: i16, dy: i16) {
-        self.x = ((self.x as i16) + dx as i16) as u16;
+        self.x = ((self.x as i16) + dx) as usize;
-        self.y = ((self.y as i16) + dy as i16) as u16;
+        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;
     }
 }