Refactor map

src/inventory_system.rs

@@ -91,7 +91,7 @@ impl<'a> System<'a> for ItemUseSystem {
             healing,
             inflicts_damage,
             _ranged,
-            mut map,
+            map,
             mut suffer_damage,
             aoe,
             mut confused,

src/main.rs

@@ -30,6 +30,7 @@ mod healing_system;
 mod hunger_system;
 mod inventory_system;
 mod map;
+pub mod map_builders;
 mod map_indexing_system;
 mod melee_combat_system;
 mod monster_ai_system;
@@ -40,8 +41,8 @@ mod rect;
 mod rex_assets;
 mod save_load_system;
 mod spawner;
-mod visibility_system;
 mod trigger_system;
+mod visibility_system;
 
 #[derive(PartialEq, Copy, Clone)]
 pub enum RunState {
@@ -83,20 +84,22 @@ impl State {
         }
 
         // Build a new map and place the player
+        let mut map_builder = map_builders::new_random_builder(1);
         let worldmap;
+        let player_start;
         {
             let mut worldmap_resource = self.ecs.write_resource::<Map>();
-            *worldmap_resource = Map::new_map_rooms_and_corridors(1);
+            map_builder.build_map();
+            *worldmap_resource = map_builder.get_map();
+            player_start = map_builder.get_starting_position();
             worldmap = worldmap_resource.clone();
         }
 
         // Spawn bad guys
-        for room in worldmap.rooms.iter().skip(1) {
+        map_builder.spawn_entities(&mut self.ecs);
-            spawner::spawn_room(&mut self.ecs, room, 1);
-        }
 
         // Place the player and update resources
-        let (player_x, player_y) = worldmap.rooms[0].center();
+        let (player_x, player_y) = (player_start.x, player_start.y);
         let player_entity = spawner::player(&mut self.ecs, player_x, player_y);
         let mut player_position = self.ecs.write_resource::<Point>();
         *player_position = Point::new(player_x, player_y);
@@ -164,20 +167,23 @@ impl State {
                 .expect("Unable to delete entity")
         }
 
+        let mut map_builder;
         let worldmap;
         let current_depth;
+        let player_start;
         {
             let mut worldmap_resource = self.ecs.write_resource::<Map>();
             current_depth = worldmap_resource.depth;
-            *worldmap_resource = Map::new_map_rooms_and_corridors(current_depth + 1);
+            map_builder = map_builders::new_random_builder(current_depth + 1);
+            map_builder.build_map();
+            *worldmap_resource = map_builder.get_map();
+            player_start = map_builder.get_starting_position();
             worldmap = worldmap_resource.clone();
         }
 
-        for room in worldmap.rooms.iter().skip(1) {
+        map_builder.spawn_entities(&mut self.ecs);
-            spawner::spawn_room(&mut self.ecs, room, current_depth + 1);
-        }
 
-        let (player_x, player_y) = worldmap.rooms[0].center();
+        let (player_x, player_y) = (player_start.x, player_start.y);
         let mut player_position = self.ecs.write_resource::<Point>();
         *player_position = Point::new(player_x, player_y);
         let mut position_components = self.ecs.write_storage::<Position>();
@@ -512,14 +518,14 @@ fn main() -> rltk::BError {
 
     gs.ecs.insert(SimpleMarkerAllocator::<SerializeMe>::new());
 
-    let map = Map::new_map_rooms_and_corridors(1);
+    let mut map_builder = map_builders::new_random_builder(1);
-    let (player_x, player_y) = map.rooms[0].center();
+    map_builder.build_map();
+    let player_pos = map_builder.get_starting_position();
+    let mut map = map_builder.get_map();
+    let (player_x, player_y) = (player_pos.x, player_pos.y);
 
     let player_entity = spawner::player(&mut gs.ecs, player_x, player_y);
-
+    map_builder.spawn_entities(&mut gs.ecs);
-    for room in map.rooms.iter().skip(1) {
-        spawner::spawn_room(&mut gs.ecs, room, 1);
-    }
 
     gs.ecs.insert(map);
     gs.ecs.insert(Point::new(player_x, player_y));

src/map.rs

@@ -1,7 +1,6 @@
-use std::cmp::{max, min};
 use std::collections::HashSet;
 
-use rltk::{Algorithm2D, BaseMap, FontCharType, Point, RandomNumberGenerator, Rltk, RGB};
+use rltk::{Algorithm2D, BaseMap, FontCharType, Point, RGB, Rltk};
 use serde::{Deserialize, Serialize};
 use specs::prelude::*;
 
@@ -22,7 +21,6 @@ pub const MAX_MONSTER: i32 = 4;
 #[derive(Default, Serialize, Deserialize, Clone)]
 pub struct Map {
     pub tiles: Vec<TileType>,
-    pub rooms: Vec<Rect>,
     pub width: i32,
     pub height: i32,
     pub revealed_tiles: Vec<bool>,
@@ -41,33 +39,6 @@ impl Map {
         (y as usize * self.width as usize) + x as usize
     }
 
-    fn apply_room_to_map(&mut self, room: &Rect) {
-        for y in room.y1 + 1..=room.y2 {
-            for x in room.x1 + 1..=room.x2 {
-                let idx = self.xy_idx(x, y);
-                self.tiles[idx] = TileType::Floor;
-            }
-        }
-    }
-
-    fn apply_horizontal_tunnel(&mut self, x1: i32, x2: i32, y: i32) {
-        for x in min(x1, x2)..=max(x1, x2) {
-            let idx = self.xy_idx(x, y);
-            if idx > 0 && idx < self.width as usize * self.height as usize {
-                self.tiles[idx as usize] = TileType::Floor;
-            }
-        }
-    }
-
-    fn apply_vertical_tunnel(&mut self, y1: i32, y2: i32, x: i32) {
-        for y in min(y1, y2)..=max(y1, y2) {
-            let idx = self.xy_idx(x, y);
-            if idx > 0 && idx < self.width as usize * self.height as usize {
-                self.tiles[idx as usize] = TileType::Floor;
-            }
-        }
-    }
-
     fn is_exit_valid(&self, x: i32, y: i32) -> bool {
         if x < 1 || x > self.width - 1 || y < 1 || y > self.height - 1 {
             return false;
@@ -88,10 +59,9 @@ impl Map {
         }
     }
 
-    pub fn new_map_rooms_and_corridors(new_depth: i32) -> Map {
+    pub fn new(new_depth: i32) -> Map {
-        let mut map = Map {
+        Map {
             tiles: vec![TileType::Wall; MAP_COUNT],
-            rooms: Vec::new(),
             width: MAP_WIDTH as i32,
             height: MAP_HEIGHT as i32,
             revealed_tiles: vec![false; MAP_COUNT],
@@ -100,50 +70,7 @@ impl Map {
             tile_content: vec![Vec::new(); MAP_COUNT],
             depth: new_depth,
             bloodstains: HashSet::new(),
-        };
-
-        const MAX_ROOMS: i32 = 30;
-        const MIN_SIZE: i32 = 6;
-        const MAX_SIZE: i32 = 10;
-
-        let mut rng = RandomNumberGenerator::new();
-
-        for _ in 0..MAX_ROOMS {
-            let w = rng.range(MIN_SIZE, MAX_SIZE);
-            let h = rng.range(MIN_SIZE, MAX_SIZE);
-            let x = rng.roll_dice(1, map.width - w - 1) - 1;
-            let y = rng.roll_dice(1, map.height - h - 1) - 1;
-            let new_room = Rect::new(x, y, w, h);
-            let mut ok = true;
-            for other_room in map.rooms.iter() {
-                if new_room.intersect(other_room) {
-                    ok = false
-                };
-            }
-            if ok {
-                map.apply_room_to_map(&new_room);
-
-                if !map.rooms.is_empty() {
-                    let (new_x, new_y) = new_room.center();
-                    let (prev_x, prev_y) = map.rooms[map.rooms.len() - 1].center();
-                    if rng.range(0, 2) == 1 {
-                        map.apply_horizontal_tunnel(prev_x, new_x, prev_y);
-                        map.apply_vertical_tunnel(prev_y, new_y, new_x);
-                    } else {
-                        map.apply_vertical_tunnel(prev_y, new_y, prev_x);
-                        map.apply_horizontal_tunnel(prev_x, new_x, new_y);
-                    }
-                }
-
-                map.rooms.push(new_room);
-            }
         }
-
-        let stairs_position = map.rooms[map.rooms.len() - 1].center();
-        let stairs_idx = map.xy_idx(stairs_position.0, stairs_position.1);
-        map.tiles[stairs_idx] = TileType::DownStairs;
-
-        map
     }
 }
 

src/map_builders/common.rs

@@ -0,0 +1,31 @@
+use std::cmp::{max, min};
+
+use crate::rect::Rect;
+use crate::{Map, TileType};
+
+pub fn apply_room_to_map(map: &mut Map, room: &Rect) {
+    for y in room.y1 + 1..=room.y2 {
+        for x in room.x1 + 1..=room.x2 {
+            let idx = map.xy_idx(x, y);
+            map.tiles[idx] = TileType::Floor;
+        }
+    }
+}
+
+pub fn apply_horizontal_tunnel(map: &mut Map, x1: i32, x2: i32, y: i32) {
+    for x in min(x1, x2)..=max(x1, x2) {
+        let idx = map.xy_idx(x, y);
+        if idx > 0 && idx < map.width as usize * map.height as usize {
+            map.tiles[idx as usize] = TileType::Floor;
+        }
+    }
+}
+
+pub fn apply_vertical_tunnel(map: &mut Map, y1: i32, y2: i32, x: i32) {
+    for y in min(y1, y2)..=max(y1, y2) {
+        let idx = map.xy_idx(x, y);
+        if idx > 0 && idx < map.width as usize * map.height as usize {
+            map.tiles[idx as usize] = TileType::Floor;
+        }
+    }
+}

src/map_builders/mod.rs

@@ -0,0 +1,18 @@
+use specs::World;
+
+use crate::{Map, Position};
+use crate::map_builders::simple_map::SimpleMapBuilder;
+
+pub mod common;
+pub mod simple_map;
+
+pub trait MapBuilder {
+    fn build_map(&mut self);
+    fn spawn_entities(&mut self, ecs: &mut World);
+    fn get_map(&self) -> Map;
+    fn get_starting_position(&self) -> Position;
+}
+
+pub fn new_random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
+    Box::new(SimpleMapBuilder::new(new_depth))
+}

src/map_builders/simple_map.rs

@@ -0,0 +1,90 @@
+use rltk::RandomNumberGenerator;
+use specs::prelude::*;
+
+use crate::{Map, Position, spawner, TileType};
+use crate::map_builders::{common, MapBuilder};
+use crate::rect::Rect;
+
+pub struct SimpleMapBuilder {
+    map: Map,
+    starting_position: Position,
+    depth: i32,
+    rooms: Vec<Rect>,
+}
+
+impl SimpleMapBuilder {
+    pub fn new(new_depth: i32) -> Self {
+        Self {
+            starting_position: Position { x: 0, y: 0 },
+            map: Map::new(new_depth),
+            depth: new_depth,
+            rooms: Vec::new(),
+        }
+    }
+
+    fn rooms_and_corridors(&mut self) {
+        const MAX_ROOMS: i32 = 30;
+        const MIN_SIZE: i32 = 6;
+        const MAX_SIZE: i32 = 10;
+
+        let mut rng = RandomNumberGenerator::new();
+
+        for _ in 0..MAX_ROOMS {
+            let w = rng.range(MIN_SIZE, MAX_SIZE);
+            let h = rng.range(MIN_SIZE, MAX_SIZE);
+            let x = rng.roll_dice(1, self.map.width - w - 1) - 1;
+            let y = rng.roll_dice(1, self.map.height - h - 1) - 1;
+            let new_room = Rect::new(x, y, w, h);
+            let mut ok = true;
+            for other_room in self.rooms.iter() {
+                if new_room.intersect(other_room) {
+                    ok = false
+                };
+            }
+            if ok {
+                common::apply_room_to_map(&mut self.map, &new_room);
+
+                if !self.rooms.is_empty() {
+                    let (new_x, new_y) = new_room.center();
+                    let (prev_x, prev_y) = self.rooms[self.rooms.len() - 1].center();
+                    if rng.range(0, 2) == 1 {
+                        common::apply_horizontal_tunnel(&mut self.map, prev_x, new_x, prev_y);
+                        common::apply_vertical_tunnel(&mut self.map, prev_y, new_y, new_x);
+                    } else {
+                        common::apply_vertical_tunnel(&mut self.map, prev_y, new_y, prev_x);
+                        common::apply_horizontal_tunnel(&mut self.map, prev_x, new_x, new_y);
+                    }
+                }
+
+                self.rooms.push(new_room);
+            }
+        }
+
+        let stairs_position = self.rooms[self.rooms.len() - 1].center();
+        let stairs_idx = self.map.xy_idx(stairs_position.0, stairs_position.1);
+        self.map.tiles[stairs_idx] = TileType::DownStairs;
+
+        let start_pos = self.rooms[0].center();
+        self.starting_position = Position { x: start_pos.0, y: start_pos.1 }
+    }
+}
+
+impl MapBuilder for SimpleMapBuilder {
+    fn build_map(&mut self) {
+        self.rooms_and_corridors();
+    }
+
+    fn spawn_entities(&mut self, ecs: &mut World) {
+        for room in self.rooms.iter().skip(1) {
+            spawner::spawn_room(ecs, room, self.depth);
+        }
+    }
+
+    fn get_map(&self) -> Map {
+        self.map.clone()
+    }
+
+    fn get_starting_position(&self) -> Position {
+        self.starting_position.clone()
+    }
+}

src/spawner.rs

@@ -4,9 +4,14 @@ use rltk::{FontCharType, RandomNumberGenerator, RGB};
 use specs::prelude::*;
 use specs::saveload::{MarkedBuilder, SimpleMarker};
 
-use crate::{AreaOfEffect, BlocksTile, CombatStats, Confusion, Consumable, DefenseBonus, EntryTrigger, EquipmentSlot, Equippable, Hidden, HungerClock, HungerState, InflictsDamage, Item, MagicMapper, MAP_WIDTH, MAX_MONSTER, MeleePowerBonus, Monster, Name, Player, Position, ProvidesFood, ProvidesHealing, Ranged, Renderable, SerializeMe, SingleActivation, Viewshed};
 use crate::random_table::RandomTable;
 use crate::rect::Rect;
+use crate::{
+    AreaOfEffect, BlocksTile, CombatStats, Confusion, Consumable, DefenseBonus, EntryTrigger,
+    EquipmentSlot, Equippable, Hidden, HungerClock, HungerState, InflictsDamage, Item, MagicMapper,
+    MeleePowerBonus, Monster, Name, Player, Position, ProvidesFood, ProvidesHealing, Ranged,
+    Renderable, SerializeMe, SingleActivation, Viewshed, MAP_WIDTH, MAX_MONSTER,
+};
 
 pub fn player(ecs: &mut World, player_x: i32, player_y: i32) -> Entity {
     ecs.create_entity()

src/trigger_system.rs

@@ -1,7 +1,10 @@
 use specs::prelude::*;
 
-use crate::{EntityMoved, EntryTrigger, GameLog, Hidden, InflictsDamage, Map, Name, Position, SingleActivation, SufferDamage};
 use crate::particle_system::ParticleBuilder;
+use crate::{
+    EntityMoved, EntryTrigger, GameLog, Hidden, InflictsDamage, Map, Name, Position,
+    SingleActivation, SufferDamage,
+};
 
 pub struct TriggerSystem {}
 
@@ -18,11 +21,24 @@ impl<'a> System<'a> for TriggerSystem {
         ReadStorage<'a, InflictsDamage>,
         WriteExpect<'a, ParticleBuilder>,
         WriteStorage<'a, SufferDamage>,
-        WriteStorage<'a, SingleActivation>
+        WriteStorage<'a, SingleActivation>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
-        let (map, mut entity_moved, position, entry_trigger, mut hidden, names, entities, mut game_log, inflicts_damage, mut particle_builder, mut inflict_damage, mut single_activation) = data;
+        let (
+            map,
+            mut entity_moved,
+            position,
+            entry_trigger,
+            mut hidden,
+            names,
+            entities,
+            mut game_log,
+            inflicts_damage,
+            mut particle_builder,
+            mut inflict_damage,
+            single_activation,
+        ) = data;
 
         let mut remove_entities: Vec<Entity> = Vec::new();
         for (entity, mut _entity_moved, pos) in (&entities, &mut entity_moved, &position).join() {
@@ -41,7 +57,14 @@ impl<'a> System<'a> for TriggerSystem {
                     hidden.remove(*entity_id);
 
                     if let Some(damage) = inflicts_damage.get(*entity_id) {
-                        particle_builder.request(pos.x, pos.y, rltk::RGB::named(rltk::ORANGE), rltk::RGB::named(rltk::BLACK), rltk::to_cp437('‼'), 200.0);
+                        particle_builder.request(
+                            pos.x,
+                            pos.y,
+                            rltk::RGB::named(rltk::ORANGE),
+                            rltk::RGB::named(rltk::BLACK),
+                            rltk::to_cp437('‼'),
+                            200.0,
+                        );
                         SufferDamage::new_damage(&mut inflict_damage, entity, damage.damage);
                     }
 
@@ -59,4 +82,3 @@ impl<'a> System<'a> for TriggerSystem {
         entity_moved.clear();
     }
 }
-

src/visibility_system.rs

@@ -1,7 +1,11 @@
 use rltk::{field_of_view, Point, RandomNumberGenerator};
 use specs::prelude::*;
 
-use crate::{components::{Player, Position, Viewshed}, GameLog, Hidden, map::Map, Name};
+use crate::{
+    components::{Player, Position, Viewshed},
+    map::Map,
+    GameLog, Hidden, Name,
+};
 
 pub struct VisibilitySystem {}
 
@@ -15,11 +19,21 @@ impl<'a> System<'a> for VisibilitySystem {
         WriteStorage<'a, Hidden>,
         WriteExpect<'a, RandomNumberGenerator>,
         ReadStorage<'a, Name>,
-        WriteExpect<'a, GameLog>
+        WriteExpect<'a, GameLog>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
-        let (mut map, entities, mut viewshed, pos, player, mut hidden, mut rng, names, mut game_log) = data;
+        let (
+            mut map,
+            entities,
+            mut viewshed,
+            pos,
+            player,
+            mut hidden,
+            mut rng,
+            names,
+            mut game_log,
+        ) = data;
         for (ent, viewshed, pos) in (&entities, &mut viewshed, &pos).join() {
             if !viewshed.dirty {
                 continue;
@@ -45,7 +59,9 @@ impl<'a> System<'a> for VisibilitySystem {
                         if let Some(_maybe_hidden) = hidden.get(*e) {
                             if rng.roll_dice(1, 24) == 1 {
                                 if let Some(name) = names.get(*e) {
-                                    game_log.entries.push(format!("You spotted a {}.", &name.name));
+                                    game_log
+                                        .entries
+                                        .push(format!("You spotted a {}.", &name.name));
                                 }
                                 hidden.remove(*e);
                             }