monsters can be attack but do not die

src/game.rs

@@ -1,4 +1,4 @@
-use crate::level::{Level, LevelElement};
+use crate::level::{Artifact, Level, StructureElement};
 use crate::player::Player;
 
 pub struct Game {
@@ -9,46 +9,58 @@ pub struct Game {
 impl Game {
     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 player_pos = self.player.get_position();
         let level = &self.levels[player_pos.get_level()];
         let new_x: i16 = player_pos.get_x() as i16 + dx;
         let new_y: i16 = player_pos.get_y() as i16 + dy;
         let can_go: bool = match level.get_element(new_x, new_y) {
-            None => { false }
-            Some(t) => {
+            (None, _, _) => { false }
+            (_, _, Some(e)) => {
+                self.levels[player_pos.get_level()].attack(new_x, new_y, &mut self.player)
+            }
+            (Some(t), _, _) => {
                 match t {
-                    LevelElement::Wall => { false }
+                    StructureElement::Wall => { false }
                     _ => { true }
                 }
             }
         };
         if can_go {
-            match level.get_element(new_x, new_y).unwrap() {
-                LevelElement::StairDown => {
+            let tmp = level.get_element(new_x, new_y);
+            match tmp.0.unwrap() {
+                StructureElement::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 => {
+                StructureElement::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());
                 }
             };
+            match tmp.1 {
+                Some(Artifact::Chest {gold}) => {
+                    self.levels[player_pos.get_level()].remove_artifact(new_x, new_y);
+                    self.player.add_gold(gold);
+                }
+                _ => {}
+            }
+            // match tmp.2 {
+            //     Some(enemy) => {
+            //         // todo!("implement fighting!");
+            //         self.levels[player_pos.get_level()].attack(new_x, new_y, &mut self.player);
+            //     }
+            //     _ => {}
+            // }
         }
     }
 }

src/level.rs

@@ -1,36 +1,33 @@
 use std::cmp::{max, min};
+use crate::monster::Monster;
+use crate::player::Player;
 use crate::position::Position;
 
 pub const LEVEL_WIDTH: usize = 50;
 pub const LEVEL_HEIGHT: usize = 25;
 
 #[derive(Copy, Clone, Debug, PartialEq)]
-pub enum LevelElement {
+pub enum StructureElement {
     Wall,
     Floor,
     StairDown,
     StairUp,
     Start,
     End,
-    Chest { gold: usize },
     Unknown,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq)]
-pub enum RoomType {
-    Start,
-    End,
-    StairUp,
-    StairDown,
-    BasicRoom,
-    TreasureRoom,
-    EmptyRoom,
+pub enum Artifact {
+    Chest { gold: usize },
 }
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Level {
-    pub(crate) structure: [[LevelElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
     pub(crate) discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) artifacts: [[Option<Artifact>; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) enemies: [[Option<Monster>; LEVEL_HEIGHT]; LEVEL_WIDTH],
     pub(crate) start_x: usize,
     pub(crate) start_y: usize,
     pub(crate) end_x: usize,
@@ -39,60 +36,105 @@ pub struct Level {
 
 impl Level {
     pub fn new() -> Level {
-        let s = [[LevelElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
+        let s = [[StructureElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
         Level {
             structure: s,
             discovered: [[false; LEVEL_HEIGHT]; LEVEL_WIDTH],
+            artifacts: [[None; LEVEL_HEIGHT]; LEVEL_WIDTH],
+            enemies: [[None; 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> {
+    pub(crate) fn attack(&self, x: i16, y: i16, player: &mut Player) -> bool {
         if x < 0 || y < 0 {
-            return None;
+            return false;
         }
         let x = x as usize;
         let y = y as usize;
         if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
-            return None;
+            return false;
         }
-        if self.discovered[x][y] {
-            return Some(self.structure[x][y]);
+
+        match &self.enemies[x][y] {
+            Some(mut enemy) => {
+                player.change_life(-1);
+                enemy.decrease_life(1);
+                println!("{}",enemy.get_life());
+                return enemy.get_life() == 0
             }
-        return Some(LevelElement::Unknown);
+            _ => {}
+        }
+        false
+    }
+    pub fn remove_artifact(&mut self, x: i16, y: i16) {
+        if x < 0 || y < 0 {
+            return;
+        }
+        let x = x as usize;
+        let y = y as usize;
+        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
+            return;
+        }
+        self.artifacts[x][y] = None;
+    }
+    pub fn get_element(&self, x: i16, y: i16) -> (Option<StructureElement>, Option<Artifact>, Option<Monster>) {
+        if x < 0 || y < 0 {
+            return (None, None, None);
+        }
+        let x = x as usize;
+        let y = y as usize;
+        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
+            return (None, None, None);
+        }
+        // if !self.discovered[x][y] {
+        // if !self.discovered[x][y] {
+        //     return (Some(StructureElement::Unknown), None, None);
+        // }
+        return (Some(self.structure[x][y]), self.artifacts[x][y], self.enemies[x][y]);
     }
     /// 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] == LevelElement::Wall {
+            if self.structure[x_r][y] == StructureElement::Wall {
                 break;
             }
         }
+
+        // uncover fields up to 2 fields below of the player
         for y_r in y..=min(y + 2, LEVEL_HEIGHT - 1) {
             self.discovered[x][y_r] = true;
-            if self.structure[x][y_r] == LevelElement::Wall {
+            if self.structure[x][y_r] == StructureElement::Wall {
                 break;
             }
         }
+
+        // uncover fields up to 2 fields left of the player
         for x_r in (max(x, 2)..x + 2).rev() {
             self.discovered[x_r - 2][y] = true;
-            if self.structure[x_r - 2][y] == LevelElement::Wall {
+            if self.structure[x_r - 2][y] == StructureElement::Wall {
                 break;
             }
         }
+
+        // uncover fields up to 2 fields above of the player
         for y_r in (max(y, 2)..y + 2).rev() {
             self.discovered[x][y_r - 2] = true;
-            if self.structure[x][y_r - 2] == LevelElement::Wall {
+            if self.structure[x][y_r - 2] == StructureElement::Wall {
                 break;
             }
         }
@@ -102,8 +144,8 @@ impl Level {
 #[test]
 fn test_get_element() {
     let l = Level::new();
-    assert_eq!(l.get_element(0, 0).unwrap(), LevelElement::Wall);
-    assert_eq!(l.get_element(4, 4).unwrap(), LevelElement::StairDown);
-    assert_eq!(l.get_element(49, 24).unwrap(), LevelElement::Wall);
-    assert_eq!(l.get_element(50, 25), None);
+    assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Wall);
+    assert_eq!(l.get_element(4, 4).0.unwrap(), StructureElement::StairDown);
+    assert_eq!(l.get_element(49, 24).0.unwrap(), StructureElement::Wall);
+    assert_eq!(l.get_element(50, 25).0, None);
 }

src/level_generator.rs

@@ -9,13 +9,26 @@ use rand::prelude::SliceRandom;
 use rand::Rng;
 use rand::rngs::ThreadRng;
 
-use crate::level::{Level, LevelElement, RoomType};
+use crate::level::{Artifact, Level, StructureElement};
+use crate::monster::Monster;
 
 const ROOMS_VERTICAL: usize = 7;
 const ROOMS_HORIZONTAL: usize = 4;
 const ROOM_WIDTH: usize = 7;
 const ROOM_HEIGHT: usize = 6;
 
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum RoomType {
+    Start,
+    End,
+    StairUp,
+    StairDown,
+    BasicRoom,
+    TreasureRoom,
+    MonsterRoom,
+    EmptyRoom,
+}
+
 #[derive(Copy, Clone, Debug, PartialEq)]
 struct ConnectionInfo {
     offset: usize,
@@ -91,12 +104,14 @@ impl LevelGenerator {
             } else {
                 room_types.push(RoomType::StairDown);
             }
-            room_types.push(RoomType::TreasureRoom);
+            room_types.push(RoomType::MonsterRoom);
             // generate a random set of rooms and shuffle them
             for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL {
-                match rng.gen_range(1..=6) {
+                match rng.gen_range(1..=100) {
                     // TODO tune room type distribution
-                    1..=3 => { room_types.push(RoomType::EmptyRoom) }
+                    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) }
                 }
             }
@@ -225,7 +240,9 @@ impl LevelGenerator {
     }
     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 structure = [[StructureElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
+        let mut artifacts = [[None; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
+        let mut enemies = [[None; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
         let mut start_x: usize = 0;
         let mut start_y: usize = 0;
         let mut end_x: usize = 0;
@@ -237,33 +254,39 @@ impl LevelGenerator {
                 let room = self.rooms[c][r];
                 for x in 0..room.width {
                     for y in 0..room.height {
-                        s[left + room.offset_x + x][top + room.offset_y + y] = LevelElement::Floor;
+                        structure[left + room.offset_x + x][top + room.offset_y + y] = StructureElement::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)};
+                    artifacts[t_x][t_y] = Some(Artifact::Chest { gold: rng.gen_range(2..30) });
+                }
+                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
+                    enemies[t_x][t_y] = Some(Monster::new(2));
                 }
                 if room.kind == RoomType::StairDown {
                     end_x = left + room.offset_x + rng.gen_range(0..room.width);
                     end_y = top + room.offset_y + rng.gen_range(0..room.height);
                 }
                 if room.kind == RoomType::StairDown {
-                    s[end_x][end_y] = LevelElement::StairDown;
+                    structure[end_x][end_y] = StructureElement::StairDown;
                 }
                 if room.kind == RoomType::End {
-                    s[end_x][end_y] = LevelElement::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 {
-                    s[start_x][start_y] = LevelElement::StairUp;
+                    structure[start_x][start_y] = StructureElement::StairUp;
                 }
                 if room.kind == RoomType::Start {
-                    s[start_x][start_y] = LevelElement::Start;
+                    structure[start_x][start_y] = StructureElement::Start;
                 }
             }
         }
@@ -277,8 +300,8 @@ impl LevelGenerator {
                     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 structure[left][i] == StructureElement::Wall {
+                            structure[left][i] = StructureElement::Floor;
                         }
                     }
                 }
@@ -289,16 +312,18 @@ impl LevelGenerator {
                     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;
+                        if structure[i][top] == StructureElement::Wall {
+                            structure[i][top] = StructureElement::Floor;
                         }
                     }
                 }
             }
         }
         Level {
-            structure: s,
+            structure,
             discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH],
+            artifacts,
+            enemies,
             start_x,
             start_y,
             end_x,

src/level_widget.rs

@@ -2,10 +2,11 @@ use ratatui::prelude::*;
 use ratatui::widgets::Widget;
 
 use crate::game::Game;
-use crate::level::{Level, LevelElement};
+use crate::level::{Artifact, Level, StructureElement};
 
 const FG_BROWN: Color = Color::Rgb(186, 74, 0);
 
+//⌂ α Ω
 pub struct LevelWidget<'a> {
     pub game: &'a Game,
 }
@@ -19,12 +20,12 @@ impl<'a> LevelWidget<'a> {
             set_fg(fg);
     }
 
-    fn calculate_wall(top: Option<LevelElement>, right: Option<LevelElement>, bottom: Option<LevelElement>, left: Option<LevelElement>) -> String {
+    fn calculate_wall(top: Option<StructureElement>, right: Option<StructureElement>, bottom: Option<StructureElement>, left: Option<StructureElement>) -> String {
         let mut val = 0;
         val += match top {
             Some(n) => {
                 match n {
-                    LevelElement::Wall => 1,
+                    StructureElement::Wall => 1,
                     _ => 0
                 }
             }
@@ -33,7 +34,7 @@ impl<'a> LevelWidget<'a> {
         val += match right {
             Some(n) => {
                 match n {
-                    LevelElement::Wall => 2,
+                    StructureElement::Wall => 2,
                     _ => 0
                 }
             }
@@ -42,7 +43,7 @@ impl<'a> LevelWidget<'a> {
         val += match bottom {
             Some(n) => {
                 match n {
-                    LevelElement::Wall => 4,
+                    StructureElement::Wall => 4,
                     _ => 0
                 }
             }
@@ -51,7 +52,7 @@ impl<'a> LevelWidget<'a> {
         val += match left {
             Some(n) => {
                 match n {
-                    LevelElement::Wall => 8,
+                    StructureElement::Wall => 8,
                     _ => 0
                 }
             }
@@ -81,36 +82,47 @@ impl<'a> Widget for LevelWidget<'a> {
                 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) => {
+                    (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);
+                            Artifact::Chest { gold: _ } => {
+                                self.set_cell(buf, x, y, "⌂", Color::Black, Color::Gray);
+                            }
+                        }
+                    }
+                    (_, _, Some(e)) => {
+                        match e {
+                            Ene => {
+                                self.set_cell(buf, x, y, "R", Color::Black, Color::Gray);
+                            }
+                        }
+                    }
+                    (Some(e), _, _) => {
+                        match e {
+                            StructureElement::Wall => {
+                                let top = level.get_element(level_x, level_y - 1).0;
+                                let right = level.get_element(level_x + 1, level_y).0;
+                                let bottom = level.get_element(level_x, level_y + 1).0;
+                                let left = level.get_element(level_x - 1, level_y).0;
                                 let symbol = LevelWidget::calculate_wall(top, right, bottom, left);
                                 self.set_cell(buf, x, y, symbol.as_str(), FG_BROWN, Color::Gray);
                             }
-                            LevelElement::Floor => {
+                            StructureElement::Floor => {
                                 self.set_cell(buf, x, y, " ", FG_BROWN, Color::Gray);
                             }
-                            LevelElement::StairDown => {
+                            StructureElement::StairDown => {
                                 self.set_cell(buf, x, y, ">", Color::Black, Color::Gray);
                             }
-                            LevelElement::StairUp => {
+                            StructureElement::StairUp => {
                                 self.set_cell(buf, x, y, "<", Color::Black, Color::Gray);
                             }
-                            LevelElement::Unknown => {
+                            StructureElement::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 => {
+                            StructureElement::Start => {
                                 self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
                             }
-                            LevelElement::End => {
+                            StructureElement::End => {
                                 self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
                             }
                         }
@@ -128,7 +140,7 @@ impl<'a> Widget for LevelWidget<'a> {
 
 #[test]
 fn test_get_wall_symbol() {
-    let wall = Some(LevelElement::Wall);
+    let wall = Some(StructureElement::Wall);
     // 0
     let s = LevelWidget::calculate_wall(None, None, None, None);
     assert_eq!(s, "╋");

src/main.rs

@@ -25,6 +25,7 @@ mod level;
 mod position;
 mod level_widget;
 mod level_generator;
+mod monster;
 
 fn main() -> Result<()> {
     let mut levels: [Level; 25] = [Level::new(); 25];
@@ -72,14 +73,12 @@ fn main() -> Result<()> {
                 height: 25,
             };
             frame.render_widget(
-                Paragraph::new(format!("{}\nHealth: {}/{}\nGold: {}\n{}/{}/{}",
+                Paragraph::new(format!("{}\nHealth: {}/{}\nGold: {}\nLevel: {}",
                                        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()))
+                                       g.player.get_position().get_level()))
                     .white()
                     .on_blue(),
                 stats_area,

src/monster.rs

@@ -0,0 +1,20 @@
+use std::cmp::{max, min};
+
+use crate::position::Position;
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub struct Monster {
+    life: usize,
+}
+
+impl Monster {
+    pub fn new(life: usize) -> Monster {
+        Monster {
+            life,
+        }
+    }
+    pub fn get_life(&self) -> usize { self.life }
+    pub fn decrease_life(&mut self, by: i16) {
+        self.life = max(0, (self.life as i16 - by) as usize);
+    }
+}

src/player.rs

@@ -51,6 +51,7 @@ fn test_get_name() {
     let p = Player {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
+        gold: 0,
         life: 5,
         max_life: 10,
     };
@@ -62,6 +63,7 @@ fn test_change_life() {
     let mut p = Player {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
+        gold: 0,
         life: 5,
         max_life: 10,
     };