cleanup

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);

src/constants.rs

@@ -2,7 +2,6 @@ use std::{collections::HashMap, ops::RangeInclusive};
 
 use crate::{monster::MonsterTypes, room::RoomType};
 
-
 /// the number of rooms in vertical direction
 pub const ROOMS_HORIZONTAL: usize = 8;
 /// the number of rooms in horizontal direction
@@ -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::MonsterRoom, 5),
+            (RoomType::ArtifactRoom, 10),
+            (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/level.rs

@@ -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);

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;
 
@@ -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 {
-                            if rooms[col][room_row].kind == RoomType::EmptyRoom {
+                        for (col, room_col) in rooms.iter().enumerate().take(ROOMS_HORIZONTAL) {
+                            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 row in 0..ROOMS_VERTICAL {
-                        if rooms[col][row].kind == RoomType::EmptyRoom {
+                for (col, room_col) in rooms.iter().enumerate().take(ROOMS_HORIZONTAL) {
+                    for (row, room) in room_col.iter().enumerate().take(ROOMS_VERTICAL) {
+                        if room.kind == RoomType::EmptyRoom {
                             free_pos.push((col, row));
                         }
                     }
@@ -134,13 +136,16 @@ impl LevelGenerator {
         rooms
     }
 
-    fn create_mst(
-        rooms: &[[Room; ROOMS_VERTICAL]; ROOMS_HORIZONTAL],
-    ) -> Graph<(usize, usize), u16, petgraph::Undirected> {
-        let mut graph = UnGraph::<(usize, usize), u16>::default();
-        for col in 0..ROOMS_HORIZONTAL {
-            for row in 0..ROOMS_VERTICAL {
-                if rooms[col][row].kind != RoomType::EmptyRoom {
+    fn create_mst(rooms: &[[Room; ROOMS_VERTICAL]; ROOMS_HORIZONTAL]) -> GeneratorGraph {
+        // calculate the weight of an edge
+        fn calc_edge_weight(delta: usize) -> usize {
+            delta * delta
+        }
+
+        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 {
-                        if rooms[col_1][row].kind != RoomType::EmptyRoom {
+                    for (col_1, tgt_col) in rooms
+                        .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))
-        // graph
+        let mut mst: GeneratorGraph = Graph::from_elements(min_spanning_tree(&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,13 +248,14 @@ impl LevelGenerator {
                     end_pos: (end_col, end_row),
                 });
             } else {
-                // println!("Right");
-                let start_col = 1 + (src_node_col * ROOM_WIDTH) + src_room.offset_x + src_room.width;
+                // Down
+                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;
+                    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;
                 let end_row =
-                    1 + tgt_node_row * ROOM_HEIGHT + tgt_room.offset_y + (tgt_room.height-1) / 2;
+                    1 + tgt_node_row * ROOM_HEIGHT + tgt_room.offset_y + (tgt_room.height - 1) / 2;
                 rooms[src_node_col][src_node_row].connection_right = Some(Connection {
                     start_pos: (start_col, start_row),
                     end_pos: (end_col, end_row),
@@ -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
-        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);
-
+        let mst: GeneratorGraph = 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]
-// fn test_level_gen() {
-//     for _ in 0..1000 {
-//         LevelGenerator::generate(0, true, false).render();
-//     }
-// }
+#[test]
+fn test_level_gen() {
+    for _ in 0..1000 {
+        LevelGenerator::generate(0, true, false).render();
+    }
+}
 
-// #[test]
-// fn test_level_gen_respects_level() {
-//     let level = LevelGenerator::generate(0, true, false).render();
-//     assert_eq!(0, level.level);
-//     let level = LevelGenerator::generate(1, true, false).render();
-//     assert_eq!(1, level.level);
-// }
+#[test]
+fn test_level_gen_respects_level() {
+    let level = LevelGenerator::generate(0, true, false).render();
+    assert_eq!(0, level.level);
+    let level = LevelGenerator::generate(1, true, false).render();
+    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);
 
@@ -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_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/monster.rs

@@ -45,7 +45,7 @@ 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,
@@ -56,7 +56,7 @@ 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,
@@ -67,7 +67,7 @@ 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,
@@ -78,7 +78,7 @@ 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,
@@ -89,7 +89,7 @@ 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,

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 d_col = max(self.start_pos.0, self.end_pos.0) - min(self.start_pos.0, self.end_pos.0);
+        let abs_d_col =
+            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 {
-            for row in self.start_pos.1..=self.end_pos.1 {
+        if abs_d_col == 0 {
+            for row in calc_range(self.end_pos.1, self.start_pos.1) {
                 tgt[self.end_pos.0][row] = StructureElement::Floor;
             }
-        } 
-        if d_row == 0 {
-            for col in self.start_pos.0..=self.end_pos.0 {
+        } else if abs_d_row == 0 {
+            for col in calc_range(self.end_pos.0, self.start_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,12 +121,12 @@ pub struct Room {
 
 impl Room {
     pub fn new(rng: &mut ThreadRng) -> Self {
-        let width = ROOM_WIDTH-1; //rng.gen_range(3..ROOM_WIDTH);
-        let height = ROOM_HEIGHT-1; //rng.gen_range(3..ROOM_HEIGHT);
-        let offset_x = 0; //rng.gen_range(0..(ROOM_WIDTH - width));
-        let offset_y = 0; //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);
+        let width = rng.gen_range(ROOM_MIN_WIDTH..ROOM_WIDTH);
+        let height = rng.gen_range(ROOM_MIN_HEIGHT..ROOM_HEIGHT);
+        let offset_x = rng.gen_range(0..(ROOM_WIDTH - width));
+        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);
 
         Self {
             kind: RoomType::EmptyRoom,
@@ -83,13 +140,13 @@ impl Room {
         }
     }
 
-    pub fn get_x_range(&self) -> Range<usize> {
-        self.offset_x..self.offset_x + self.width
-    }
+    // pub fn get_x_range(&self) -> Range<usize> {
+    //     self.offset_x..self.offset_x + self.width
+    // }
 
-    pub fn get_y_range(&self) -> Range<usize> {
-        self.offset_y..self.offset_y + self.height
-    }
+    // pub fn get_y_range(&self) -> Range<usize> {
+    //     self.offset_y..self.offset_y + self.height
+    // }
 
     pub fn render(
         &self,