fix formatting

.gitea/workflows/publish.yaml

@@ -22,3 +22,7 @@ jobs:
           ls -al target/debian
           UPLOAD_FILE=$(ls target/debian/*.deb)
           curl --user jlusiardi:${{ secrets.UPLOAD_TOKEN }} --upload-file ${UPLOAD_FILE} https://gitea.intern.haus-in-hirschaid.de/api/packages/jlusiardi/debian/pool/bionic/main/upload          
+          echo -e "${{ secrets.DEPLOY_PRIVATE_KEY }}" > /tmp/ssh_key
+          chmod 0600 /tmp/ssh_key
+          scp -o StrictHostKeyChecking=no -i /tmp/ssh_key ${UPLOAD_FILE} jlusiardi@april2023.lusiardi.de:/var/www/p17.lusiardi.de/el_diabolo
+          ssh -o StrictHostKeyChecking=no -i /tmp/ssh_key jlusiardi@april2023.lusiardi.de /var/www/p17.lusiardi.de/el_diabolo/generate_index.sh

Cargo.lock

@@ -147,7 +147,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "el_diabolo"
-version = "0.1.0"
+version = "0.2.3"
 dependencies = [
  "crossterm",
  "macros",
@@ -234,6 +234,12 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
 [[package]]
 name = "instability"
 version = "0.3.2"
@@ -429,23 +435,23 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d"
+checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
 dependencies = [
  "bitflags 2.4.1",
  "cassowary",
  "compact_str",
  "crossterm",
+ "indoc",
  "instability",
  "itertools",
  "lru",
  "paste",
  "strum",
- "strum_macros",
  "unicode-segmentation",
  "unicode-truncate",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -598,7 +604,7 @@ checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
 dependencies = [
  "itertools",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -607,6 +613,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"

Cargo.toml

@@ -3,13 +3,13 @@ members = ["macros"]
 
 [package]
 name = "el_diabolo"
-version = "0.1.0"
+version = "0.2.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ratatui = "0.28.1"
+ratatui = "0.29.0"
 crossterm = "0.28.1"
 rand = "0.8.5"
 petgraph = "0.6.5"

macros/src/lib.rs

@@ -3,7 +3,6 @@ extern crate proc_macro;
 use proc_macro::TokenStream;
 use quote::quote;
 
-
 #[proc_macro_derive(CreateMonsters)]
 pub fn create_monsters(input: TokenStream) -> TokenStream {
     let input = syn::parse_macro_input!(input as syn::File);
@@ -25,6 +24,7 @@ pub fn create_monsters(input: TokenStream) -> TokenStream {
             experience_gain: usize,
             ticks_between_steps: u128,
             damage_range: RangeInclusive<usize>,
+            defense: usize,
         }
         impl Monster for #variant_name {
             fn get_name(&self) -> &str { &self.name }
@@ -36,7 +36,7 @@ pub fn create_monsters(input: TokenStream) -> TokenStream {
             }
             fn get_ticks_between_steps(&self) -> u128 { self.ticks_between_steps }
             fn damage(&self) -> usize { rand::thread_rng().gen_range(self.damage_range.clone()) }
-
+            fn defense(&self) -> usize { self.defense }
             #[cfg(test)]
             fn get_life(&self) -> usize { self.life }
         }

src/constants.rs

@@ -1,7 +1,6 @@
 use std::{collections::HashMap, ops::RangeInclusive};
 
-use crate::{monster::MonsterTypes, room::RoomType};
+use crate::{monsters::MonsterTypes, room::RoomType};
-
 
 /// the number of rooms in vertical direction
 pub const ROOMS_HORIZONTAL: usize = 8;
@@ -13,8 +12,14 @@ pub const ROOM_WIDTH: usize = 9;
 /// the height of a room in the grid of rooms (number of characters)
 pub const ROOM_HEIGHT: usize = 6;
 
+// the minmal width of a room
+pub const ROOM_MIN_WIDTH: usize = 4;
+
+// the minmal height of a room
+pub const ROOM_MIN_HEIGHT: usize = 4;
+
 /// How many levels does the dungeon have?
-pub const LEVELS: usize = 2;
+pub const LEVELS: usize = 4;
 
 /// length of a game frame in ms
 pub const FRAME_LENGTH: u64 = 100;
@@ -41,6 +46,12 @@ pub fn get_monsters_per_level() -> Vec<HashMap<MonsterTypes, std::ops::RangeIncl
             (MonsterTypes::Skeleton, 33),
             (MonsterTypes::Snake, 33),
         ],
+        // level 4
+        vec![
+            (MonsterTypes::Orc, 34),
+            (MonsterTypes::Skeleton, 33),
+            (MonsterTypes::Snake, 33),
+        ],
     ];
     if tmp.len() < LEVELS {
         panic!(
@@ -74,8 +85,8 @@ pub fn get_room_type_per_level() -> Vec<HashMap<RoomType, std::ops::RangeInclusi
         // level 1
         vec![
             (RoomType::EmptyRoom, 50),
-            (RoomType::ArtifactRoom, 25),
+            (RoomType::ArtifactRoom, 10),
-            (RoomType::MonsterRoom, 5),
+            (RoomType::MonsterRoom, 20),
             (RoomType::BasicRoom, 20),
         ],
         // level 2
@@ -86,7 +97,17 @@ pub fn get_room_type_per_level() -> Vec<HashMap<RoomType, std::ops::RangeInclusi
             (RoomType::ArtifactRoom, 13),
         ],
         // level 3
-        vec![(RoomType::EmptyRoom, 50), (RoomType::MonsterRoom, 50)],
+        vec![
+            (RoomType::EmptyRoom, 50),
+            (RoomType::BasicRoom, 25),
+            (RoomType::MonsterRoom, 25),
+        ],
+        // level 4
+        vec![
+            (RoomType::BasicRoom, 33),
+            (RoomType::MonsterRoom, 33),
+            (RoomType::ArtifactRoom, 34),
+        ],
     ];
     if tmp.len() < LEVELS {
         panic!(

src/game.rs

@@ -164,10 +164,10 @@ impl Game {
         match m {
             None => {}
             Some(m) => {
-                let player_dmg = self.player.damage();
+                let player_dmg = self.player.damage().saturating_sub(m.defense());
                 m.decrease_life(player_dmg);
                 if m.is_dead() {
-                    self.player.gain_experience(m.get_experience_gain());
+                    let level_up: bool = self.player.gain_experience(m.get_experience_gain());
                     self.messages.insert(
                         0,
                         format!(
@@ -177,13 +177,23 @@ impl Game {
                         )
                         .to_string(),
                     );
+                    if level_up {
+                        self.messages.insert(
+                            0,
+                            format!(
+                                "you reach a new experience level, it's now {}",
+                                self.player.get_experience_level(),
+                            )
+                            .to_string(),
+                        );
+                    }
                 } else {
                     self.messages.insert(
                         0,
                         format!("you hit {} for {} damage.", m.get_name(), player_dmg).to_string(),
                     );
-                    let monster_dmg = m.damage() as i16;
+                    let monster_dmg = m.damage().saturating_sub(self.player.defense());
-                    self.player.change_life(-monster_dmg);
+                    self.player.change_life(-(monster_dmg as i16));
 
                     self.messages.insert(
                         0,

src/level.rs

@@ -8,9 +8,9 @@ use crate::artifacts::Artifact;
 use crate::artifacts::{Chest, Potion};
 use crate::constants::LEVEL_HEIGHT;
 use crate::constants::LEVEL_WIDTH;
-use crate::monster::Monster;
+use crate::monsters::Monster;
 #[cfg(test)]
-use crate::monster::{Orc, Rat};
+use crate::monsters::{Orc, Rat};
 use crate::player::Player;
 use crate::position::HasPosition;
 use crate::position::Position;
@@ -57,7 +57,7 @@ impl Level {
             return (None, None, None);
         }
         if !self.discovered[x][y] {
-            #[cfg(test)]
+            // #[cfg(test)]
             return (Some(StructureElement::Unknown), None, None);
         }
         let search_pos = &Position::new(self.level, x, y);
@@ -147,8 +147,21 @@ impl Level {
                     if player.get_immutable_position().get_x() == new_x
                         && player.get_immutable_position().get_y() == new_y
                     {
-                        let monster_dmg = self.monsters[index].damage() as i16;
+                        let monster_dmg = self.monsters[index]
-                        player.change_life(-monster_dmg);
+                            .damage()
+                            .saturating_sub(player.defense());
+                        player.change_life(-(monster_dmg as i16));
+                        if player.is_dead() {
+                            messages.insert(
+                                0,
+                                format!(
+                                    "{} hits you for {} damage and kills you.",
+                                    self.monsters[index].get_name(),
+                                    monster_dmg
+                                )
+                                .to_string(),
+                            );
+                        } else {
                             messages.insert(
                                 0,
                                 format!(
@@ -158,12 +171,16 @@ impl Level {
                                 )
                                 .to_string(),
                             );
-
+                            // player not dead => monster can occupy new position
-                        let player_dmg = player.damage();
+                            self.monsters[index].get_position().change(-dx, -dy);
+                            // player fights back
+                            let player_dmg = player
+                                .damage()
+                                .saturating_sub(self.monsters[index].defense());
                             self.monsters[index].decrease_life(player_dmg);
-
+                            if self.monsters[index].is_dead() {
-                        // if the attack did not kill the opponent, back down
+                                let level_up: bool = player
-                        if !player.is_dead() {
+                                    .gain_experience(self.monsters[index].get_experience_gain());
                                 messages.insert(
                                     0,
                                     format!(
@@ -173,7 +190,16 @@ impl Level {
                                     )
                                     .to_string(),
                                 );
-                            self.monsters[index].get_position().change(-dx, -dy);
+                                if level_up {
+                                    messages.insert(
+                                        0,
+                                        format!(
+                                            "you reach a new experience level, it's now {}",
+                                            player.get_experience_level(),
+                                        )
+                                        .to_string(),
+                                    );
+                                }
                             } else {
                                 messages.insert(
                                     0,
@@ -186,6 +212,7 @@ impl Level {
                                 );
                             }
                         }
+                    }
                     break;
                 }
             }

src/level_generator.rs

@@ -1,5 +1,6 @@
 use petgraph::algo::min_spanning_tree;
 use petgraph::data::*;
+use petgraph::graph::Edge;
 use petgraph::graph::Graph;
 use petgraph::graph::UnGraph;
 
@@ -12,8 +13,8 @@ use crate::artifacts::Potion;
 use crate::constants::get_monsters_per_level;
 use crate::constants::ROOM_HEIGHT;
 use crate::constants::ROOM_WIDTH;
-use crate::monster::create_monster_by_type;
+use crate::monsters::create_monster_by_type;
-use crate::monster::Monster;
+use crate::monsters::Monster;
 use crate::position::Position;
 use crate::room::Connection;
 use crate::{
@@ -24,6 +25,7 @@ use crate::{
     room::{Room, RoomType},
 };
 
+type GeneratorGraph = Graph<(usize, usize), usize, petgraph::Undirected>;
 pub struct LevelGenerator {
     level: usize,
     rooms: [[Room; ROOMS_VERTICAL]; ROOMS_HORIZONTAL],
@@ -84,8 +86,8 @@ impl LevelGenerator {
                 match directions_to_try.pop().unwrap() {
                     Direction::Horizontal => {
                         let mut free_cols: Vec<usize> = vec![];
-                        for col in 0..ROOMS_HORIZONTAL {
+                        for (col, room_col) in rooms.iter().enumerate().take(ROOMS_HORIZONTAL) {
-                            if rooms[col][room_row].kind == RoomType::EmptyRoom {
+                            if room_col[room_row].kind == RoomType::EmptyRoom {
                                 free_cols.push(col);
                             }
                         }
@@ -120,9 +122,9 @@ impl LevelGenerator {
             // all fields in the row/column was full so we can place it at any empty position
             if !placed {
                 let mut free_pos: Vec<(usize, usize)> = vec![];
-                for col in 0..ROOMS_HORIZONTAL {
+                for (col, room_col) in rooms.iter().enumerate().take(ROOMS_HORIZONTAL) {
-                    for row in 0..ROOMS_VERTICAL {
+                    for (row, room) in room_col.iter().enumerate().take(ROOMS_VERTICAL) {
-                        if rooms[col][row].kind == RoomType::EmptyRoom {
+                        if room.kind == RoomType::EmptyRoom {
                             free_pos.push((col, row));
                         }
                     }
@@ -134,13 +136,16 @@ impl LevelGenerator {
         rooms
     }
 
-    fn create_mst(
+    fn create_mst(rooms: &[[Room; ROOMS_VERTICAL]; ROOMS_HORIZONTAL]) -> GeneratorGraph {
-        rooms: &[[Room; ROOMS_VERTICAL]; ROOMS_HORIZONTAL],
+        // calculate the weight of an edge
-    ) -> Graph<(usize, usize), u16, petgraph::Undirected> {
+        fn calc_edge_weight(delta: usize) -> usize {
-        let mut graph = UnGraph::<(usize, usize), u16>::default();
+            delta * delta
-        for col in 0..ROOMS_HORIZONTAL {
+        }
-            for row in 0..ROOMS_VERTICAL {
+
-                if rooms[col][row].kind != RoomType::EmptyRoom {
+        let mut graph: GeneratorGraph = UnGraph::<(usize, usize), usize>::default();
+        for (col, tgt_col) in rooms.iter().enumerate().take(ROOMS_HORIZONTAL) {
+            for (row, room) in tgt_col.iter().enumerate().take(ROOMS_VERTICAL) {
+                if room.kind != RoomType::EmptyRoom {
                     graph.add_node((col, row));
                 }
             }
@@ -151,12 +156,21 @@ impl LevelGenerator {
                     continue;
                 }
                 if let Some(src_index) = graph.node_indices().find(|i| graph[*i] == (col, row)) {
-                    for col_1 in col + 1..ROOMS_HORIZONTAL {
+                    for (col_1, tgt_col) in rooms
-                        if rooms[col_1][row].kind != RoomType::EmptyRoom {
+                        .iter()
+                        .enumerate()
+                        .take(ROOMS_HORIZONTAL)
+                        .skip(col + 1)
+                    {
+                        if tgt_col[row].kind != RoomType::EmptyRoom {
                             if let Some(tgt_index) =
                                 graph.node_indices().find(|i| graph[*i] == (col_1, row))
                             {
-                                graph.add_edge(src_index, tgt_index, 1);
+                                graph.add_edge(
+                                    src_index,
+                                    tgt_index,
+                                    calc_edge_weight(col.abs_diff(col_1)),
+                                );
                                 break;
                             }
                         }
@@ -166,7 +180,11 @@ impl LevelGenerator {
                             if let Some(tgt_index) =
                                 graph.node_indices().find(|i| graph[*i] == (col, row_1))
                             {
-                                graph.add_edge(src_index, tgt_index, 1);
+                                graph.add_edge(
+                                    src_index,
+                                    tgt_index,
+                                    calc_edge_weight(row.abs_diff(row_1)),
+                                );
                                 break;
                             }
                         }
@@ -174,13 +192,40 @@ impl LevelGenerator {
                 }
             }
         }
-        Graph::from_elements(min_spanning_tree(&graph))
+        let mut mst: GeneratorGraph = Graph::from_elements(min_spanning_tree(&graph));
-        // graph
+
+        // readd some of the short edges that were remove (all between a weight of 1 to 10)
+        let initial_edges = graph.raw_edges();
+        let minimal_edges = mst.raw_edges();
+        let mut extra_edges: Vec<Edge<usize>> = vec![];
+        for init_edge in initial_edges {
+            let start_node = init_edge.source();
+            let end_node = init_edge.target();
+            let mut found = false;
+            for min_edge in minimal_edges {
+                if min_edge.source() == start_node && min_edge.target() == end_node {
+                    found = true;
+                    break;
+                }
+            }
+            if !found {
+                extra_edges.push(init_edge.clone());
+            }
+        }
+        extra_edges.sort_by(|a, b| a.weight.cmp(&b.weight));
+        for e in extra_edges
+            .iter()
+            .filter(|x| x.weight > 1)
+            .filter(|x| x.weight < 7)
+        {
+            mst.add_edge(e.source(), e.target(), e.weight);
+        }
+        mst
     }
 
     fn create_connections(
         rooms: &mut [[Room; ROOMS_VERTICAL]; ROOMS_HORIZONTAL],
-        mst: &Graph<(usize, usize), u16, petgraph::Undirected>,
+        mst: &GeneratorGraph,
     ) {
         for edge in mst.raw_edges() {
             // the tuples are (col, row)
@@ -190,6 +235,7 @@ impl LevelGenerator {
             let tgt_room = rooms[tgt_node_col][tgt_node_row];
 
             if src_node_col == tgt_node_col {
+                // Right
                 let start_col =
                     src_node_col * ROOM_WIDTH + src_room.offset_x + (src_room.width + 1) / 2;
                 let start_row =
@@ -202,8 +248,9 @@ impl LevelGenerator {
                     end_pos: (end_col, end_row),
                 });
             } else {
-                // println!("Right");
+                // Down
-                let start_col = 1 + (src_node_col * ROOM_WIDTH) + src_room.offset_x + src_room.width;
+                let start_col =
+                    1 + (src_node_col * ROOM_WIDTH) + src_room.offset_x + src_room.width;
                 let start_row =
                     1 + src_node_row * ROOM_HEIGHT + src_room.offset_y + (src_room.height - 1) / 2;
                 let end_col = 1 + tgt_node_col * ROOM_WIDTH - 1 + tgt_room.offset_x;
@@ -220,40 +267,11 @@ impl LevelGenerator {
     pub fn generate(level: usize, first: bool, last: bool) -> Self {
         let mut rng = rand::thread_rng();
 
-        /*
-           Fill grid with unconnected rooms
-        */
-
         let mut rooms_to_place: Vec<Room> =
             LevelGenerator::generate_rooms_to_place(&mut rng, level, first, last);
         let mut rooms: [[Room; 7]; 8] = LevelGenerator::place_rooms(&mut rng, &mut rooms_to_place);
 
-        // debug print a text view of the dungeon
+        let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
-        println!("  0 1 2 3 4 5 6 7");
-        for r in 0..ROOMS_VERTICAL {
-            print!("{} ", r);
-            for c in 0..ROOMS_HORIZONTAL {
-                match rooms[c][r].kind {
-                    RoomType::Start => print!("S "),
-                    RoomType::End => print!("E "),
-                    RoomType::StairUp => print!("< "),
-                    RoomType::StairDown => print!("> "),
-                    RoomType::BasicRoom => print!("_ "),
-                    RoomType::ArtifactRoom => print!("A "),
-                    RoomType::MonsterRoom => print!("M "),
-                    RoomType::EmptyRoom => print!("  "),
-                };
-            }
-            println!();
-        }
-
-        /*
-           Construct a graph from the unconnected rooms and make a minum spanning tree of it
-        */
-
-        let mst: Graph<(usize, usize), u16, petgraph::Undirected> =
-            LevelGenerator::create_mst(&rooms);
-
         LevelGenerator::create_connections(&mut rooms, &mst);
         LevelGenerator { level, rooms, rng }
     }
@@ -331,11 +349,11 @@ impl LevelGenerator {
             for row in 0..ROOMS_VERTICAL {
                 if let Some(connection) = self.rooms[col][row].connection_down {
                     // println!("down");
-                    connection.render(&mut structure);
+                    connection.render(&mut self.rng, &mut structure);
                 }
                 if let Some(connection) = self.rooms[col][row].connection_right {
                     // println!("right");
-                    connection.render(&mut structure);
+                    connection.render(&mut self.rng, &mut structure);
                 }
             }
         }
@@ -352,20 +370,20 @@ impl LevelGenerator {
     }
 }
 
-// #[test]
+#[test]
-// fn test_level_gen() {
+fn test_level_gen() {
-//     for _ in 0..1000 {
+    for _ in 0..1000 {
-//         LevelGenerator::generate(0, true, false).render();
+        LevelGenerator::generate(0, true, false).render();
-//     }
+    }
-// }
+}
 
-// #[test]
+#[test]
-// fn test_level_gen_respects_level() {
+fn test_level_gen_respects_level() {
-//     let level = LevelGenerator::generate(0, true, false).render();
+    let level = LevelGenerator::generate(0, true, false).render();
-//     assert_eq!(0, level.level);
+    assert_eq!(0, level.level);
-//     let level = LevelGenerator::generate(1, true, false).render();
+    let level = LevelGenerator::generate(1, true, false).render();
-//     assert_eq!(1, level.level);
+    assert_eq!(1, level.level);
-// }
+}
 
 #[cfg(test)]
 fn find_room_types(rooms: &Vec<Room>) -> (bool, bool, bool, bool) {
@@ -500,7 +518,7 @@ fn test_place_rooms() {
 fn test_create_mst() {
     let mut rng = rand::thread_rng();
     let mut rooms = [[Room::new(&mut rng); ROOMS_VERTICAL]; ROOMS_HORIZONTAL];
-    let res: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let res: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     assert_eq!(res.node_count(), 0);
     assert_eq!(res.edge_count(), 0);
 
@@ -522,12 +540,12 @@ fn test_create_mst() {
     rooms[3][3].kind = RoomType::BasicRoom;
     let res = LevelGenerator::create_mst(&rooms);
     assert_eq!(res.node_count(), 4);
-    assert_eq!(res.edge_count(), 3);
+    assert_eq!(res.edge_count(), 4);
 
     rooms[3][5].kind = RoomType::BasicRoom;
     let res = LevelGenerator::create_mst(&rooms);
     assert_eq!(res.node_count(), 5);
-    assert_eq!(res.edge_count(), 4);
+    assert_eq!(res.edge_count(), 5);
 }
 
 #[test]
@@ -545,7 +563,7 @@ fn test_create_connections() {
     rooms[3][0].height = ROOM_HEIGHT - 1;
     rooms[3][0].offset_y = 0;
     rooms[3][0].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     println!("{:?}", mst);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
@@ -580,7 +598,7 @@ fn test_create_connections_2() {
     rooms[3][0].height = ROOM_HEIGHT - 1;
     rooms[3][0].offset_y = 0;
     rooms[3][0].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][0].connection_right.is_some());
@@ -614,7 +632,7 @@ fn test_create_connections_d_1() {
     rooms[0][3].height = ROOM_HEIGHT - 1;
     rooms[0][3].offset_y = 0;
     rooms[0][3].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     println!("{:?}", mst);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
@@ -651,7 +669,7 @@ fn test_create_connections_d_2() {
     rooms[1][3].height = ROOM_HEIGHT - 1;
     rooms[1][3].offset_y = 0;
     rooms[1][3].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_some());
@@ -686,7 +704,7 @@ fn test_create_connections_d_3() {
     rooms[1][3].height = ROOM_HEIGHT - 1;
     rooms[1][3].offset_y = 0;
     rooms[1][3].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_some());
@@ -721,7 +739,7 @@ fn test_create_connections_d_4() {
     rooms[1][3].height = ROOM_HEIGHT - 1;
     rooms[1][3].offset_y = 0;
     rooms[1][3].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_some());
@@ -756,7 +774,7 @@ fn test_create_connections_d_5() {
     rooms[1][3].height = 4;
     rooms[1][3].offset_y = 1;
     rooms[1][3].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_some());
@@ -790,7 +808,7 @@ fn test_create_connections_right_1() {
     rooms[3][1].height = ROOM_HEIGHT - 1;
     rooms[3][1].offset_y = 0;
     rooms[3][1].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_none());
@@ -825,7 +843,7 @@ fn test_create_connections_right_2() {
     rooms[3][1].height = 4;
     rooms[3][1].offset_y = 2;
     rooms[3][1].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_none());
@@ -860,7 +878,7 @@ fn test_create_connections_right_3() {
     rooms[3][1].height = 2;
     rooms[3][1].offset_y = 4;
     rooms[3][1].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_none());
@@ -895,7 +913,7 @@ fn test_create_connections_right_4() {
     rooms[3][1].height = 2;
     rooms[3][1].offset_y = 4;
     rooms[3][1].kind = RoomType::BasicRoom;
-    let mst: Graph<(usize, usize), u16, petgraph::Undirected> = LevelGenerator::create_mst(&rooms);
+    let mst: GeneratorGraph = LevelGenerator::create_mst(&rooms);
     LevelGenerator::create_connections(&mut rooms, &mst);
 
     assert!(rooms[1][1].connection_down.is_none());

src/level_ladder.rs

@@ -0,0 +1,30 @@
+pub struct LevelLadder {
+    curr: usize,
+    next: usize,
+}
+
+impl Iterator for LevelLadder {
+    type Item = usize;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let current = self.curr;
+
+        self.curr = self.next;
+        self.next += current;
+
+        // Since there's no endpoint to a Fibonacci sequence, the `Iterator`
+        // will never return `None`, and `Some` is always returned.
+        Some(current * 30)
+    }
+}
+
+// Returns a Fibonacci sequence generator
+pub fn get_level_ladder() -> LevelLadder {
+    LevelLadder { curr: 1, next: 2 }
+}
+
+#[test]
+fn test_level_ladder() {
+    let mut iter = get_level_ladder();
+    assert_eq!(iter.next(), Some(30));
+}

src/level_widget.rs

@@ -17,7 +17,11 @@ impl LevelWidget {
         buf[(x, y)].set_symbol(symbol).set_bg(bg).set_fg(fg);
     }
     fn set_bold_cell(&self, buf: &mut Buffer, x: u16, y: u16, symbol: &str, fg: Color, bg: Color) {
-        buf[(x, y)].set_symbol(symbol).set_bg(bg).set_fg(fg).set_style(Style::new().add_modifier(Modifier::BOLD));
+        buf[(x, y)]
+            .set_symbol(symbol)
+            .set_bg(bg)
+            .set_fg(fg)
+            .set_style(Style::new().add_modifier(Modifier::BOLD));
     }
 }
 

src/main.rs

@@ -14,7 +14,6 @@ use crossterm::{
     ExecutableCommand,
 };
 use ratatui::prelude::*;
-use ratatui::widgets::block::{Position, Title};
 use ratatui::widgets::{Block, BorderType, Borders, Wrap};
 use ratatui::{
     prelude::{CrosstermBackend, Terminal},
@@ -32,12 +31,16 @@ mod constants;
 mod game;
 mod level;
 mod level_generator;
+mod level_ladder;
 mod level_widget;
-mod monster;
+mod monsters;
 mod player;
 mod position;
 mod room;
 
+const BACKGROUND_COLOR: Color = Color::DarkGray;
+const PANEL_BACKGROUND_COLOR: Color = Color::Black;
+
 //
 fn main() -> Result<()> {
     let mut game = Game::new(Player::new(realname().as_str(), 30));
@@ -53,7 +56,7 @@ fn main() -> Result<()> {
         terminal.draw(|frame| {
             let mut area = frame.area();
             frame.render_widget(
-                Block::default().style(Style::default().bg(Color::Green)),
+                Block::default().style(Style::default().bg(BACKGROUND_COLOR)),
                 area,
             );
 
@@ -100,20 +103,19 @@ fn main() -> Result<()> {
                 height: map_area.height / 2 + 1,
             };
             let block = Block::default()
-                .title(
+                .title_top(
-                    Title::from(format!(" {} ", game.get_player().get_name()))
+                    Line::from(format!(" {} ", game.get_player().get_name())).centered()
-                        .alignment(Alignment::Center)
-                        .position(Position::Top),
                 )
                 .borders(Borders::TOP)
                 .border_style(Style::default().fg(Color::White))
                 .border_type(BorderType::Rounded)
-                .style(Style::default().bg(Color::Blue));
+                .style(Style::default().bg(PANEL_BACKGROUND_COLOR));
             frame.render_widget(
                 Paragraph::new(format!(
-                    "Health: {} of {}\nExp: {}\nGold: {}\nLevel: {} of {}\nInventory used: {} of {}",
+                    "Health: {} of {}\nDefense: {}\nExp: {}\nGold: {}\nLevel: {} of {}\nInventory used: {} of {}",
                     game.get_player().get_life(),
                     game.get_player().get_max_life(),
+                    game.get_player().defense(),
                     game.get_player().get_experience(),
                     game.get_player().get_gold(),
                     game.get_player().get_immutable_position().get_level() + 1,
@@ -133,15 +135,13 @@ fn main() -> Result<()> {
             };
             // Display the latest messages from the game to the user
             let block = Block::default()
-                .title(
+                .title_top(
-                    Title::from(" messages ")
+                    Line::from(" messages ").centered()
-                        .alignment(Alignment::Center)
-                        .position(Position::Top),
                 )
                 .borders(Borders::TOP)
                 .border_style(Style::default().fg(Color::White))
                 .border_type(BorderType::Rounded)
-                .style(Style::default().bg(Color::Blue));
+                .style(Style::default().bg(PANEL_BACKGROUND_COLOR));
 
             let paragraph1 = if game.messages.is_empty() {
                 "".to_string()
@@ -218,12 +218,8 @@ fn main() -> Result<()> {
             area.width = 40;
             area.height = 20;
             let block = Block::default()
-                .title(
+                .title_top(Line::from(" Game ended ").centered())
-                    Title::from(" Game ended ")
+                .title_bottom(Line::from("Press `q` to quit!"))
-                        .alignment(Alignment::Center)
-                        .position(Position::Top),
-                )
-                .title(Title::from("Press `q` to quit!").position(Position::Bottom))
                 .borders(Borders::ALL)
                 .border_style(Style::default().fg(Color::White))
                 .border_type(BorderType::Rounded)

src/monsters.rs

@@ -16,6 +16,7 @@ pub trait Monster: HasPosition {
     #[cfg(test)]
     fn get_life(&self) -> usize;
     fn damage(&self) -> usize;
+    fn defense(&self) -> usize;
 }
 
 #[derive(CreateMonsters, PartialEq, Eq, Hash, Clone, Copy)]
@@ -45,10 +46,11 @@ create_monster!(
     name:"rat".to_string(),
     life: 2,
     symbol: String::from("r"),
-    color: Color::Black,
+    color: Color::White,
     experience_gain: 5,
     ticks_between_steps: 5,
     damage_range: 1..=2,
+    defense: 0,
 );
 
 create_monster!(
@@ -56,10 +58,11 @@ create_monster!(
     name:"spider".to_string(),
     life: 3,
     symbol: String::from("s"),
-    color: Color::Blue,
+    color: Color::Yellow,
     experience_gain: 7,
     ticks_between_steps: 7,
     damage_range: 2..=3,
+    defense: 0,
 );
 
 create_monster!(
@@ -67,10 +70,11 @@ create_monster!(
     name: "orc".to_string(),
     life: 4,
     symbol: String::from("O"),
-    color: Color::DarkGray,
+    color: Color::Gray,
     experience_gain: 10,
     ticks_between_steps: 10,
     damage_range: 2..=3,
+    defense: 0,
 );
 
 create_monster!(
@@ -78,10 +82,11 @@ create_monster!(
     name: "snake".to_string(),
     life: 3,
     symbol: String::from("s"),
-    color: Color::Black,
+    color: Color::White,
     experience_gain: 10,
     ticks_between_steps: 20,
     damage_range: 1..=4,
+    defense: 0,
 );
 
 create_monster!(
@@ -89,10 +94,11 @@ create_monster!(
     name: "skeleton".to_string(),
     life: 3,
     symbol: String::from("S"),
-    color: Color::DarkGray,
+    color: Color::Gray,
     experience_gain: 20,
     ticks_between_steps: 10,
     damage_range: 1..=5,
+    defense: 0,
 );
 
 pub fn create_monster_by_type(monster_type: &MonsterTypes, position: Position) -> Box<dyn Monster> {

src/player.rs

@@ -2,6 +2,7 @@ use rand::Rng;
 use std::cmp::{max, min};
 
 use crate::artifacts::Potion;
+use crate::level_ladder::get_level_ladder;
 use crate::position::{HasPosition, Position};
 
 pub struct Player {
@@ -13,6 +14,8 @@ pub struct Player {
     experience: usize,
     inventory: Vec<Potion>,
     inventory_slots: usize,
+    level: usize,
+    defense: usize,
 }
 
 impl Player {
@@ -26,6 +29,8 @@ impl Player {
             experience: 0,
             inventory: vec![],
             inventory_slots: 2,
+            level: 1,
+            defense: 0,
         }
     }
     pub fn get_name(&self) -> String {
@@ -59,8 +64,28 @@ impl Player {
         self.gold
     }
 
-    pub fn gain_experience(&mut self, amount: usize) {
+    pub fn gain_experience(&mut self, amount: usize) -> bool {
-        self.experience += amount
+        let mut result = false;
+        for (i, level_step) in get_level_ladder().enumerate() {
+            if self.experience <= level_step && self.experience + amount > level_step {
+                self.level += 1;
+                // make life gain depend on level?
+                self.max_life += 5;
+                self.defense += 1;
+                self.life = self.max_life;
+                result = true;
+                break;
+            }
+            if i > self.level {
+                break;
+            }
+        }
+        self.experience += amount;
+        result
+    }
+
+    pub fn get_experience_level(&self) -> usize {
+        self.level
     }
 
     pub fn get_experience(&self) -> usize {
@@ -71,6 +96,10 @@ impl Player {
         rand::thread_rng().gen_range(1..4)
     }
 
+    pub fn defense(&self) -> usize {
+        self.defense
+    }
+    
     pub fn add_to_inventory(&mut self, potion: &Potion) -> bool {
         if self.inventory.len() < self.inventory_slots {
             self.inventory.push(*potion);
@@ -116,6 +145,8 @@ fn test_get_name() {
         experience: 0,
         inventory: vec![],
         inventory_slots: 1,
+        level: 0,
+        defense: 0,
     };
     assert_eq!(p.get_name(), "Teddy Tester");
 }
@@ -141,6 +172,8 @@ fn test_change_life() {
         experience: 0,
         inventory: vec![],
         inventory_slots: 1,
+        level: 0,
+        defense: 0,
     };
     assert_eq!(p.get_life(), 5);
     p.change_life(-2);
@@ -176,6 +209,8 @@ fn test_max_life() {
         experience: 0,
         inventory: vec![],
         inventory_slots: 1,
+        level: 0,
+        defense: 0,
     };
     assert_eq!(p.get_max_life(), 10);
 }

src/room.rs

@@ -1,10 +1,12 @@
 use std::{
     cmp::{max, min},
-    ops::Range,
+    ops::RangeInclusive,
 };
 
 use crate::{
-    constants::{LEVEL_HEIGHT, LEVEL_WIDTH, ROOM_HEIGHT, ROOM_WIDTH},
+    constants::{
+        LEVEL_HEIGHT, LEVEL_WIDTH, ROOM_HEIGHT, ROOM_MIN_HEIGHT, ROOM_MIN_WIDTH, ROOM_WIDTH,
+    },
     level::StructureElement,
 };
 use rand::rngs::ThreadRng;
@@ -29,23 +31,78 @@ pub struct Connection {
 }
 
 impl Connection {
-    pub fn render(&self, tgt: &mut [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH]) {
+    pub fn render(
+        &self,
+        rng: &mut ThreadRng,
+        tgt: &mut [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    ) {
+        fn calc_range(a: usize, b: usize) -> RangeInclusive<usize> {
+            if a > b {
+                b..=a
+            } else {
+                a..=b
+            }
+        }
         // the tuples are (col, row)
-        println!("{:?} -> {:?}",self.start_pos, self.end_pos);
+        let abs_d_col =
-        let d_col = max(self.start_pos.0, self.end_pos.0) - min(self.start_pos.0, self.end_pos.0);
+            max(self.start_pos.0, self.end_pos.0) - min(self.start_pos.0, self.end_pos.0);
 
-        let d_row = max(self.start_pos.1, self.end_pos.1) - min(self.start_pos.1, self.end_pos.1);
+        let abs_d_row =
+            max(self.start_pos.1, self.end_pos.1) - min(self.start_pos.1, self.end_pos.1);
 
-        if d_col == 0 {
+        if abs_d_col == 0 {
-            for row in self.start_pos.1..=self.end_pos.1 {
+            for row in calc_range(self.end_pos.1, self.start_pos.1) {
                 tgt[self.end_pos.0][row] = StructureElement::Floor;
             }
-        } 
+        } else if abs_d_row == 0 {
-        if d_row == 0 {
+            for col in calc_range(self.end_pos.0, self.start_pos.0) {
-            for col in self.start_pos.0..=self.end_pos.0 {
                 tgt[col][self.end_pos.1] = StructureElement::Floor;
             }
-
+        } else {
+            let d_row = self.end_pos.1 as i32 - self.start_pos.1 as i32;
+            if d_row > 0 {
+                // more up/down
+                let d_row = self.end_pos.1 - self.start_pos.1;
+                let vert_offset = if d_row > 3 {
+                    rng.gen_range(1..=d_row - 1)
+                } else {
+                    d_row / 2
+                };
+                for r in self.start_pos.1..=(self.start_pos.1 + vert_offset) {
+                    tgt[self.start_pos.0][r] = StructureElement::Floor;
+                }
+                for c in calc_range(self.end_pos.0, self.start_pos.0) {
+                    tgt[c][self.start_pos.1 + vert_offset] = StructureElement::Floor;
+                }
+                for r in (self.start_pos.1 + vert_offset)..=self.end_pos.1 {
+                    tgt[self.end_pos.0][r] = StructureElement::Floor;
+                }
+            } else {
+                // more left/right
+                let d_col = self.end_pos.0 - self.start_pos.0;
+                let horizont_offset = if d_col > 3 {
+                    rng.gen_range(1..=d_col - 1)
+                } else {
+                    d_col / 2
+                };
+                for tgt_col in tgt
+                    .iter_mut()
+                    .skip(self.start_pos.0)
+                    .take(horizont_offset + 1)
+                {
+                    tgt_col[self.start_pos.1] = StructureElement::Floor;
+                }
+                for r in calc_range(self.end_pos.1, self.start_pos.1) {
+                    tgt[self.start_pos.0 + horizont_offset][r] = StructureElement::Floor;
+                }
+                for tgt_col in tgt
+                    .iter_mut()
+                    .take(self.end_pos.0 + 1)
+                    .skip(self.start_pos.0 + horizont_offset)
+                {
+                    tgt_col[self.end_pos.1] = StructureElement::Floor;
+                }
+            }
         }
     }
 }
@@ -64,10 +121,10 @@ pub struct Room {
 
 impl Room {
     pub fn new(rng: &mut ThreadRng) -> Self {
-        let width = ROOM_WIDTH-1; //rng.gen_range(3..ROOM_WIDTH);
+        let width = rng.gen_range(ROOM_MIN_WIDTH..ROOM_WIDTH);
-        let height = ROOM_HEIGHT-1; //rng.gen_range(3..ROOM_HEIGHT);
+        let height = rng.gen_range(ROOM_MIN_HEIGHT..ROOM_HEIGHT);
-        let offset_x = 0; //rng.gen_range(0..(ROOM_WIDTH - width));
+        let offset_x = rng.gen_range(0..(ROOM_WIDTH - width));
-        let offset_y = 0; //rng.gen_range(0..(ROOM_HEIGHT - height));
+        let offset_y = rng.gen_range(0..(ROOM_HEIGHT - height));
         let sx = offset_x + rng.gen_range(1..width - 1);
         let sy = offset_y + rng.gen_range(1..height - 1);
 
@@ -83,13 +140,13 @@ impl Room {
         }
     }
 
-    pub fn get_x_range(&self) -> Range<usize> {
+    // pub fn get_x_range(&self) -> Range<usize> {
-        self.offset_x..self.offset_x + self.width
+    //     self.offset_x..self.offset_x + self.width
-    }
+    // }
 
-    pub fn get_y_range(&self) -> Range<usize> {
+    // pub fn get_y_range(&self) -> Range<usize> {
-        self.offset_y..self.offset_y + self.height
+    //     self.offset_y..self.offset_y + self.height
-    }
+    // }
 
     pub fn render(
         &self,