Chapter 30 - DLA - complete.

book/src/SUMMARY.md

@@ -33,7 +33,7 @@
     - [Drunkard's Walk Maps](./chapter_28.md)
     - [Mazes and Labyrinths](./chapter_29.md)
     - [Diffusion-limited aggregation maps](./chapter_30.md)
-    - Symmetrical DLA
+    - Add Symmetry and Brush Size to Drunkard's Walk, Make Generic
     - Voronoi
     - Noise
     - Quantum Waveform Collapse

book/src/chapter_30.md

@@ -10,11 +10,434 @@
 
 ---
 
-See this [excellent article on Rogue Basin](http://www.roguebasin.com/index.php?title=Diffusion-limited_aggregation).
+Diffusion-Limited Aggregation (DLA) is a fancy name for a constrained form of the drunken walk. It makes organic looking maps, with more of an emphasis on a central area and "arms" coming out of it. With some tricks, it can be made to look quite alien - or quite real. See this [excellent article on Rogue Basin](http://www.roguebasin.com/index.php?title=Diffusion-limited_aggregation).
 
-Scaffolding
+## Scaffolding
 
+We'll create a new file, `map_builders/dla.rs` and put the scaffolding in from previous projects. We'll name the builder `DLABuilder`. We'll also keep the voronoi spawn code, it will work fine for this application. Rather than repeat the scaffolding code blocks from previous chapters, we'll jump straight in. If you get stuck, you can check the source code for this chapter [here](https://github.com/thebracket/rustrogueliketutorial/tree/master/chapter-30-dla).
 
+## Algorithm Tuning Knobs
+
+In the last chapter, we introduced the idea of adding parameters to our builder. We'll do the same again for DLA - there's a few algorithm variants that can produce different map styles. We'll introduce the following enumerations:
+
+```rust
+#[derive(PartialEq, Copy, Clone)]
+pub enum DLAAlgorithm { WalkInwards, WalkOutwards, CentralAttractor }
+
+#[derive(PartialEq, Copy, Clone)]
+pub enum DLASymmetry { None, Horizontal, Vertical, Both }
+```
+
+Our builder will include one more, *brush size*:
+
+```rust
+pub struct DLABuilder {
+    map : Map,
+    starting_position : Position,
+    depth: i32,
+    history: Vec<Map>,
+    noise_areas : HashMap<i32, Vec<usize>>,
+    algorithm : DLAAlgorithm,
+    brush_size: i32,
+    symmetry: DLASymmetry,
+    floor_percent: f32
+}
+```
+
+This should be pretty self-explanatory by now if you've been through the other chapters:
+
+* We're supporting three algorithms, `WalkInwards`, `WalkOutwards`, `CentralAttractor`. We'll cover these in detail shortly.
+* We've added `symmetry`, which can be either `None`, `Horizontal`, `Vertical` or `Both`. Symmetry can be used to make some beautiful results with this algorithm, and we'll cover that later in the article.
+* We've also added `brush_size`, which specifies how many floor tiles we "paint" onto the map in one go. We'll look at this at the end of the chapter.
+* We've included `floor_percent` from the Drunkard's Walk chapter.
+
+Our `new` function needs to include these parameters:
+
+```rust
+pub fn new(new_depth : i32) -> DLABuilder {
+    DLABuilder{
+        map : Map::new(new_depth),
+        starting_position : Position{ x: 0, y : 0 },
+        depth : new_depth,
+        history: Vec::new(),
+        noise_areas : HashMap::new(),
+        algorithm: DLAAlgorithm::WalkInwards,
+        brush_size: 1,
+        symmetry: DLASymmetry::None,
+        floor_percent: 0.25
+    }
+}
+```
+
+We'll make some type constructors once we've mastered the algorithms and their variants!
+
+## Walking Inwards
+
+The most basic form of Diffusion-Limited Aggregation works like this:
+
+1. Dig a "seed" area around your central starting point.
+2. While the number of floor tiles is less than your desired total:
+    1. Select a starting point at random for your digger.
+    2. Use the "drunkard's walk" algorithm to move randomly.
+    3. If the digger hit a floor tile, then the *previous* tile they were in also becomes a floor and the digger stops.
+
+Very simple, and not too hard to implement:
+
+```rust
+fn build(&mut self) {
+    let mut rng = RandomNumberGenerator::new();
+
+    // Carve a starting seed
+    self.starting_position = Position{ x: self.map.width/2, y : self.map.height/2 };
+    let start_idx = self.map.xy_idx(self.starting_position.x, self.starting_position.y);
+    self.take_snapshot();
+    self.map.tiles[start_idx] = TileType::Floor;
+    self.map.tiles[start_idx-1] = TileType::Floor;
+    self.map.tiles[start_idx+1] = TileType::Floor;
+    self.map.tiles[start_idx-self.map.width as usize] = TileType::Floor;
+    self.map.tiles[start_idx+self.map.width as usize] = TileType::Floor;
+
+    // Random walker
+    let total_tiles = self.map.width * self.map.height;
+    let desired_floor_tiles = (self.floor_percent * total_tiles as f32) as usize;
+    let mut floor_tile_count = self.map.tiles.iter().filter(|a| **a == TileType::Floor).count();
+    while floor_tile_count  < desired_floor_tiles {
+
+        match self.algorithm {
+            DLAAlgorithm::WalkInwards => {
+                let mut digger_x = rng.roll_dice(1, self.map.width - 3) + 1;
+                let mut digger_y = rng.roll_dice(1, self.map.height - 3) + 1;
+                let mut prev_x = digger_x;
+                let mut prev_y = digger_y;
+                let mut digger_idx = self.map.xy_idx(digger_x, digger_y);
+                while self.map.tiles[digger_idx] == TileType::Wall {
+                    prev_x = digger_x;
+                    prev_y = digger_y;
+                    let stagger_direction = rng.roll_dice(1, 4);
+                    match stagger_direction {
+                        1 => { if digger_x > 2 { digger_x -= 1; } }
+                        2 => { if digger_x < self.map.width-2 { digger_x += 1; } }
+                        3 => { if digger_y > 2 { digger_y -=1; } }
+                        _ => { if digger_y < self.map.height-2 { digger_y += 1; } }
+                    }
+                    digger_idx = self.map.xy_idx(digger_x, digger_y);
+                }
+                self.paint(prev_x, prev_y);
+            }
+            _ => {}
+            ...
+```
+
+The only new thing here is the call to `paint`. We'll be extending it later (to handle brush sizes), but here's a temporary implementation:
+
+```rust
+fn paint(&mut self, x: i32, y: i32) {
+    let digger_idx = self.map.xy_idx(x, y);
+    self.map.tiles[digger_idx] = TileType::Floor;
+}
+```
+
+If you `cargo run` this, you will get a pretty cool looking dungeon:
+
+![Screenshot](./c30-s1.gif).
+
+## Walking outwards
+
+A second variant of this algorithm reverses part of the process:
+
+1. Dig a "seed" area around your central starting point.
+2. While the number of floor tiles is less than your desired total:
+    1. Set the digger to the starting central location.
+    2. Use the "drunkard's walk" algorithm to move randomly.
+    3. If the digger hit a wall tile, then that tile becomes a floor - and the digger stops.
+
+So instead of marching inwards, our brave diggers are marching outwards. Implementing this is quite simple, and can be added to the `match` sequence of algorithms in `build`:
+
+```rust
+...
+DLAAlgorithm::WalkOutwards => {
+    let mut digger_x = self.starting_position.x;
+    let mut digger_y = self.starting_position.y;
+    let mut digger_idx = self.map.xy_idx(digger_x, digger_y);
+    while self.map.tiles[digger_idx] == TileType::Floor {
+        let stagger_direction = rng.roll_dice(1, 4);
+        match stagger_direction {
+            1 => { if digger_x > 2 { digger_x -= 1; } }
+            2 => { if digger_x < self.map.width-2 { digger_x += 1; } }
+            3 => { if digger_y > 2 { digger_y -=1; } }
+            _ => { if digger_y < self.map.height-2 { digger_y += 1; } }
+        }
+        digger_idx = self.map.xy_idx(digger_x, digger_y);
+    }
+    self.paint(digger_x, digger_y);
+}
+_ => {}
+```
+
+There aren't any new concepts in this code, and if you understood Drunkard's Walk - it should be pretty self explanatory. If you adjust the constructor to use it, and call `cargo run` it looks pretty good:
+
+![Screenshot](./c30-s2.gif).
+
+## Central Attractor
+
+This variant is again very similar, but slightly different. Instead of moving randomly, your particles path from a random point towards the middle:
+
+1. Dig a "seed" area around your central starting point.
+2. While the number of floor tiles is less than your desired total:
+    1. Select a starting point at random for your digger.
+    2. Plot a line to the center of the map, and keep it.
+    3. Traverse the line. If the digger hit a floor tile, then the *previous* tile they were in also becomes a floor and the digger stops.
+
+Again, this is relatively easy to implement:
+
+```rust
+...
+DLAAlgorithm::CentralAttractor => {
+    let mut digger_x = rng.roll_dice(1, self.map.width - 3) + 1;
+    let mut digger_y = rng.roll_dice(1, self.map.height - 3) + 1;
+    let mut prev_x = digger_x;
+    let mut prev_y = digger_y;
+    let mut digger_idx = self.map.xy_idx(digger_x, digger_y);
+
+    let mut path = rltk::line2d(
+        rltk::LineAlg::Bresenham, 
+        rltk::Point::new( digger_x, digger_y ), 
+        rltk::Point::new( self.starting_position.x, self.starting_position.y )
+    );
+
+    while self.map.tiles[digger_idx] == TileType::Wall && !path.is_empty() {
+        prev_x = digger_x;
+        prev_y = digger_y;
+        digger_x = path[0].x;
+        digger_y = path[0].y;
+        path.remove(0);
+        digger_idx = self.map.xy_idx(digger_x, digger_y);
+    }
+    self.paint(prev_x, prev_y);
+}
+```
+
+If you adjust the constructor to use this algorithm, and `cargo run` the project you get a map that is more focused around a central point:
+
+![Screenshot](./c30-s3.gif).
+
+## Implementing Symmetry
+
+```
+Tyger Tyger, burning bright, 
+In the forests of the night; 
+What immortal hand or eye, 
+Could frame thy fearful symmetry?
+```
+(William Blake, The Tyger)
+
+Symmetry can transform a random map into something that looks designed - but quite alien. It often looks quite insectoid or reminiscent of a *Space Invaders* enemy. This can make for some fun-looking levels!
+
+Lets modify the `paint` function to handle symmetry:
+
+```rust
+fn paint(&mut self, x: i32, y:i32) {
+    match self.symmetry {
+        DLASymmetry::None => self.apply_paint(x, y),
+        DLASymmetry::Horizontal => {
+            let center_x = self.map.width / 2;
+            if x == center_x {
+                self.apply_paint(x, y);                    
+            } else {
+                let dist_x = i32::abs(center_x - x);
+                self.apply_paint(center_x + dist_x, y);
+                self.apply_paint(center_x - dist_x, y);
+            }
+        }
+        DLASymmetry::Vertical => {
+            let center_y = self.map.height / 2;
+            if y == center_y {
+                self.apply_paint(x, y);
+            } else {
+                let dist_y = i32::abs(center_y - y);
+                self.apply_paint(x, center_y + dist_y);
+                self.apply_paint(x, center_y - dist_y);
+            }
+        }
+        DLASymmetry::Both => {
+            let center_x = self.map.width / 2;
+            let center_y = self.map.height / 2;
+            if x == center_x && y == center_y {
+                self.apply_paint(x, y);
+            } else {
+                let dist_x = i32::abs(center_x - x);
+                self.apply_paint(center_x + dist_x, y);
+                self.apply_paint(center_x - dist_x, y);
+                let dist_y = i32::abs(center_y - y);
+                self.apply_paint(x, center_y + dist_y);
+                self.apply_paint(x, center_y - dist_y);
+            }
+        }
+    }
+```
+
+This is a longer function that it really needs to be, in the name of clarity. Here's how it works:
+
+1. We `match` on the current symmetry setting.
+2. If it is `None`, we simply call `apply_paint` with the destination tile.
+3. If it is `Horizontal`:
+    1. We check to see if we are *on* the tile - if we are, just apply the paint once.
+    2. Otherwise, obtain the horizontal distance from the center.
+    3. Paint at `center_x - distance` and `center_x + distance` to paint symmetrically on the `x` axis.
+4. If it is `Vertical`:
+    1. We check to see if we are *on* the tile - if we are, just apply the paint once (this helps with odd numbers of tiles by reducing rounding issues).
+    2. Otherwise, obtain the vertical distance from the center.
+    3. Paint at `center_y - distance` and `center_y + distance`.
+5. If it is `Both` - then do both steps.
+
+You'll notice that we're calling `apply_paint` rather than actually painting. That's because we've also implemented `brush_size`:
+
+```rust
+fn apply_paint(&mut self, x: i32, y: i32) {
+    match self.brush_size {
+        1 => {
+            let digger_idx = self.map.xy_idx(x, y);
+            self.map.tiles[digger_idx] = TileType::Floor;
+        }
+
+        _ => {
+            let half_brush_size = self.brush_size / 2;
+            for brush_y in y-half_brush_size .. y+half_brush_size {
+                for brush_x in x-half_brush_size .. x+half_brush_size {
+                    if brush_x > 1 && brush_x < self.map.width-1 && brush_y > 1 && brush_y < self.map.height-1 {
+                        let idx = self.map.xy_idx(brush_x, brush_y);
+                        self.map.tiles[idx] = TileType::Floor;
+                    }
+                }
+            }
+        }
+    }
+}
+```
+
+This is quite simple:
+
+1. If brush size is 1, we just paint a floor tile.
+2. Otherwise, we loop through the brush size - and paint, performing bounds-checking to ensure we aren't painting off the map.
+
+In your constructor, use the `CentralAttractor` algorithm - and enable symmetry with `Horizontal`. If you `cargo run` now, you get a map not unlike a cranky insectoid:
+
+![Screenshot](./c30-s4.gif).
+
+## Playing with Brush Sizes
+
+Using a larger brush is ensures that you don't get too many 1x1 areas (that can be fiddly to navigate), and gives a more planned look to the map. Now that we've already implemented brush size, modify your constructor like this:
+
+```rust
+pub fn new(new_depth : i32) -> DLABuilder {
+    DLABuilder{
+        map : Map::new(new_depth),
+        starting_position : Position{ x: 0, y : 0 },
+        depth : new_depth,
+        history: Vec::new(),
+        noise_areas : HashMap::new(),
+        algorithm: DLAAlgorithm::WalkInwards,
+        brush_size: 2,
+        symmetry: DLASymmetry::None,
+        floor_percent: 0.25
+    }
+}
+```
+
+With this simple change, our map looks much more open:
+
+![Screenshot](./c30-s5.gif).
+
+## Providing a few constructors
+
+Rather than pollute the `random_builder` function with algorithm details, we'll make constructors for each of the major algorithms we used in this chapter:
+
+```rust
+pub fn walk_inwards(new_depth : i32) -> DLABuilder {
+    DLABuilder{
+        map : Map::new(new_depth),
+        starting_position : Position{ x: 0, y : 0 },
+        depth : new_depth,
+        history: Vec::new(),
+        noise_areas : HashMap::new(),
+        algorithm: DLAAlgorithm::WalkInwards,
+        brush_size: 1,
+        symmetry: DLASymmetry::None,
+        floor_percent: 0.25
+    }
+}
+
+pub fn walk_outwards(new_depth : i32) -> DLABuilder {
+    DLABuilder{
+        map : Map::new(new_depth),
+        starting_position : Position{ x: 0, y : 0 },
+        depth : new_depth,
+        history: Vec::new(),
+        noise_areas : HashMap::new(),
+        algorithm: DLAAlgorithm::WalkOutwards,
+        brush_size: 2,
+        symmetry: DLASymmetry::None,
+        floor_percent: 0.25
+    }
+}
+
+pub fn central_attractor(new_depth : i32) -> DLABuilder {
+    DLABuilder{
+        map : Map::new(new_depth),
+        starting_position : Position{ x: 0, y : 0 },
+        depth : new_depth,
+        history: Vec::new(),
+        noise_areas : HashMap::new(),
+        algorithm: DLAAlgorithm::CentralAttractor,
+        brush_size: 2,
+        symmetry: DLASymmetry::None,
+        floor_percent: 0.25
+    }
+}
+
+pub fn insectoid(new_depth : i32) -> DLABuilder {
+    DLABuilder{
+        map : Map::new(new_depth),
+        starting_position : Position{ x: 0, y : 0 },
+        depth : new_depth,
+        history: Vec::new(),
+        noise_areas : HashMap::new(),
+        algorithm: DLAAlgorithm::CentralAttractor,
+        brush_size: 2,
+        symmetry: DLASymmetry::Horizontal,
+        floor_percent: 0.25
+    }
+}
+```
+
+## Randomizing the map builder, once again
+
+Now we can modify `random_builder` in `map_builders/mod.rs` to actually be random once more - and offer even more types of map!
+
+```rust
+pub fn random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
+    let mut rng = rltk::RandomNumberGenerator::new();
+    let builder = rng.roll_dice(1, 12);
+    match builder {
+        1 => Box::new(BspDungeonBuilder::new(new_depth)),
+        2 => Box::new(BspInteriorBuilder::new(new_depth)),
+        3 => Box::new(CellularAutomotaBuilder::new(new_depth)),
+        4 => Box::new(DrunkardsWalkBuilder::open_area(new_depth)),
+        5 => Box::new(DrunkardsWalkBuilder::open_halls(new_depth)),
+        6 => Box::new(DrunkardsWalkBuilder::winding_passages(new_depth)),
+        7 => Box::new(MazeBuilder::new(new_depth)),
+        8 => Box::new(DLABuilder::walk_inwards(new_depth)),
+        9 => Box::new(DLABuilder::walk_outwards(new_depth)),
+        10 => Box::new(DLABuilder::central_attractor(new_depth)),
+        11 => Box::new(DLABuilder::insectoid(new_depth)),
+        _ => Box::new(SimpleMapBuilder::new(new_depth))
+    }
+}
+```
+
+## Wrap-up
+
+This chapter has introduced another, very flexible, map builder for your arsenal. Great for making maps that feel like they were carved from the rock (or hewn from the forest, mined from the asteroid, etc.), it's another great way to introduce variety into your game.
 
 **The source code for this chapter may be found [here](https://github.com/thebracket/rustrogueliketutorial/tree/master/chapter-30-dla)**
 

chapter-30-dla/src/map_builders/bsp_dungeon.rs

@@ -1,5 +1,5 @@
 use super::{MapBuilder, Map, Rect, apply_room_to_map, 
-    TileType, Position, spawner, SHOW_MAPGEN_VISUALIZER};
+    TileType, Position, spawner, SHOW_MAPGEN_VISUALIZER, draw_corridor};
 use rltk::RandomNumberGenerator;
 use specs::prelude::*;
 
@@ -94,7 +94,7 @@ impl BspDungeonBuilder {
             let start_y = room.y1 + (rng.roll_dice(1, i32::abs(room.y1 - room.y2))-1);
             let end_x = next_room.x1 + (rng.roll_dice(1, i32::abs(next_room.x1 - next_room.x2))-1);
             let end_y = next_room.y1 + (rng.roll_dice(1, i32::abs(next_room.y1 - next_room.y2))-1);
-            self.draw_corridor(start_x, start_y, end_x, end_y);
+            draw_corridor(&mut self.map, start_x, start_y, end_x, end_y);
             self.take_snapshot();
         }
 
@@ -169,24 +169,4 @@ impl BspDungeonBuilder {
 
         can_build
     }
-
-    fn draw_corridor(&mut self, x1:i32, y1:i32, x2:i32, y2:i32) {
-        let mut x = x1;
-        let mut y = y1;
-
-        while x != x2 || y != y2 {
-            if x < x2 {
-                x += 1;
-            } else if x > x2 {
-                x -= 1;
-            } else if y < y2 {
-                y += 1;
-            } else if y > y2 {
-                y -= 1;
-            }
-
-            let idx = self.map.xy_idx(x, y);
-            self.map.tiles[idx] = TileType::Floor;
-        }
-    }
 }

chapter-30-dla/src/map_builders/bsp_interior.rs

@@ -1,5 +1,5 @@
-use super::{MapBuilder, Map, Rect, apply_room_to_map, 
-    TileType, Position, spawner, SHOW_MAPGEN_VISUALIZER};
+use super::{MapBuilder, Map, Rect, TileType, Position, spawner, SHOW_MAPGEN_VISUALIZER,
+    draw_corridor};
 use rltk::RandomNumberGenerator;
 use specs::prelude::*;
 
@@ -93,7 +93,7 @@ impl BspInteriorBuilder {
             let start_y = room.y1 + (rng.roll_dice(1, i32::abs(room.y1 - room.y2))-1);
             let end_x = next_room.x1 + (rng.roll_dice(1, i32::abs(next_room.x1 - next_room.x2))-1);
             let end_y = next_room.y1 + (rng.roll_dice(1, i32::abs(next_room.y1 - next_room.y2))-1);
-            self.draw_corridor(start_x, start_y, end_x, end_y);
+            draw_corridor(&mut self.map, start_x, start_y, end_x, end_y);
             self.take_snapshot();
         }
 
@@ -140,24 +140,4 @@ impl BspInteriorBuilder {
             if half_height > MIN_ROOM_SIZE { self.add_subrects(v2, rng); }
         }
     }
-
-    fn draw_corridor(&mut self, x1:i32, y1:i32, x2:i32, y2:i32) {
-        let mut x = x1;
-        let mut y = y1;
-
-        while x != x2 || y != y2 {
-            if x < x2 {
-                x += 1;
-            } else if x > x2 {
-                x -= 1;
-            } else if y < y2 {
-                y += 1;
-            } else if y > y2 {
-                y -= 1;
-            }
-
-            let idx = self.map.xy_idx(x, y);
-            self.map.tiles[idx] = TileType::Floor;
-        }
-    }
 }

chapter-30-dla/src/map_builders/common.rs

@@ -81,4 +81,24 @@ pub fn generate_voronoi_spawn_regions(map: &Map, rng : &mut rltk::RandomNumberGe
     }
 
     noise_areas
-}
+}
+
+pub fn draw_corridor(map: &mut Map, x1:i32, y1:i32, x2:i32, y2:i32) {
+        let mut x = x1;
+        let mut y = y1;
+
+        while x != x2 || y != y2 {
+            if x < x2 {
+                x += 1;
+            } else if x > x2 {
+                x -= 1;
+            } else if y < y2 {
+                y += 1;
+            } else if y > y2 {
+                y -= 1;
+            }
+
+            let idx = map.xy_idx(x, y);
+            map.tiles[idx] = TileType::Floor;
+        }
+    }

chapter-30-dla/src/map_builders/dla.rs

@@ -5,12 +5,22 @@ use rltk::RandomNumberGenerator;
 use specs::prelude::*;
 use std::collections::HashMap;
 
+#[derive(PartialEq, Copy, Clone)]
+pub enum DLAAlgorithm { WalkInwards, WalkOutwards, CentralAttractor }
+
+#[derive(PartialEq, Copy, Clone)]
+pub enum DLASymmetry { None, Horizontal, Vertical, Both }
+
 pub struct DLABuilder {
     map : Map,
     starting_position : Position,
     depth: i32,
     history: Vec<Map>,
-    noise_areas : HashMap<i32, Vec<usize>>
+    noise_areas : HashMap<i32, Vec<usize>>,
+    algorithm : DLAAlgorithm,
+    brush_size: i32,
+    symmetry: DLASymmetry,
+    floor_percent: f32
 }
 
 impl MapBuilder for DLABuilder {
@@ -54,7 +64,67 @@ impl DLABuilder {
             starting_position : Position{ x: 0, y : 0 },
             depth : new_depth,
             history: Vec::new(),
-            noise_areas : HashMap::new()
+            noise_areas : HashMap::new(),
+            algorithm: DLAAlgorithm::WalkInwards,
+            brush_size: 2,
+            symmetry: DLASymmetry::None,
+            floor_percent: 0.25
+        }
+    }
+
+    pub fn walk_inwards(new_depth : i32) -> DLABuilder {
+        DLABuilder{
+            map : Map::new(new_depth),
+            starting_position : Position{ x: 0, y : 0 },
+            depth : new_depth,
+            history: Vec::new(),
+            noise_areas : HashMap::new(),
+            algorithm: DLAAlgorithm::WalkInwards,
+            brush_size: 1,
+            symmetry: DLASymmetry::None,
+            floor_percent: 0.25
+        }
+    }
+
+    pub fn walk_outwards(new_depth : i32) -> DLABuilder {
+        DLABuilder{
+            map : Map::new(new_depth),
+            starting_position : Position{ x: 0, y : 0 },
+            depth : new_depth,
+            history: Vec::new(),
+            noise_areas : HashMap::new(),
+            algorithm: DLAAlgorithm::WalkOutwards,
+            brush_size: 2,
+            symmetry: DLASymmetry::None,
+            floor_percent: 0.25
+        }
+    }
+
+    pub fn central_attractor(new_depth : i32) -> DLABuilder {
+        DLABuilder{
+            map : Map::new(new_depth),
+            starting_position : Position{ x: 0, y : 0 },
+            depth : new_depth,
+            history: Vec::new(),
+            noise_areas : HashMap::new(),
+            algorithm: DLAAlgorithm::CentralAttractor,
+            brush_size: 2,
+            symmetry: DLASymmetry::None,
+            floor_percent: 0.25
+        }
+    }
+
+    pub fn insectoid(new_depth : i32) -> DLABuilder {
+        DLABuilder{
+            map : Map::new(new_depth),
+            starting_position : Position{ x: 0, y : 0 },
+            depth : new_depth,
+            history: Vec::new(),
+            noise_areas : HashMap::new(),
+            algorithm: DLAAlgorithm::CentralAttractor,
+            brush_size: 2,
+            symmetry: DLASymmetry::Horizontal,
+            floor_percent: 0.25
         }
     }
 
@@ -74,28 +144,73 @@ impl DLABuilder {
 
         // Random walker
         let total_tiles = self.map.width * self.map.height;
-        let desired_floor_tiles = (total_tiles / 4) as usize;
+        let desired_floor_tiles = (self.floor_percent * total_tiles as f32) as usize;
         let mut floor_tile_count = self.map.tiles.iter().filter(|a| **a == TileType::Floor).count();
         while floor_tile_count  < desired_floor_tiles {
-            let mut digger_x = rng.roll_dice(1, self.map.width - 3) + 1;
-            let mut digger_y = rng.roll_dice(1, self.map.height - 3) + 1;
-            let mut prev_x = digger_x;
-            let mut prev_y = digger_y;
-            let mut digger_idx = self.map.xy_idx(digger_x, digger_y);
-            while self.map.tiles[digger_idx] == TileType::Wall {
-                prev_x = digger_x;
-                prev_y = digger_y;
-                let stagger_direction = rng.roll_dice(1, 4);
-                match stagger_direction {
-                    1 => { if digger_x > 2 { digger_x -= 1; } }
-                    2 => { if digger_x < self.map.width-2 { digger_x += 1; } }
-                    3 => { if digger_y > 2 { digger_y -=1; } }
-                    _ => { if digger_y < self.map.height-2 { digger_y += 1; } }
+
+            match self.algorithm {
+                DLAAlgorithm::WalkInwards => {
+                    let mut digger_x = rng.roll_dice(1, self.map.width - 3) + 1;
+                    let mut digger_y = rng.roll_dice(1, self.map.height - 3) + 1;
+                    let mut prev_x = digger_x;
+                    let mut prev_y = digger_y;
+                    let mut digger_idx = self.map.xy_idx(digger_x, digger_y);
+                    while self.map.tiles[digger_idx] == TileType::Wall {
+                        prev_x = digger_x;
+                        prev_y = digger_y;
+                        let stagger_direction = rng.roll_dice(1, 4);
+                        match stagger_direction {
+                            1 => { if digger_x > 2 { digger_x -= 1; } }
+                            2 => { if digger_x < self.map.width-2 { digger_x += 1; } }
+                            3 => { if digger_y > 2 { digger_y -=1; } }
+                            _ => { if digger_y < self.map.height-2 { digger_y += 1; } }
+                        }
+                        digger_idx = self.map.xy_idx(digger_x, digger_y);
+                    }
+                    self.paint(prev_x, prev_y);
+                }
+
+                DLAAlgorithm::WalkOutwards => {
+                    let mut digger_x = self.starting_position.x;
+                    let mut digger_y = self.starting_position.y;
+                    let mut digger_idx = self.map.xy_idx(digger_x, digger_y);
+                    while self.map.tiles[digger_idx] == TileType::Floor {
+                        let stagger_direction = rng.roll_dice(1, 4);
+                        match stagger_direction {
+                            1 => { if digger_x > 2 { digger_x -= 1; } }
+                            2 => { if digger_x < self.map.width-2 { digger_x += 1; } }
+                            3 => { if digger_y > 2 { digger_y -=1; } }
+                            _ => { if digger_y < self.map.height-2 { digger_y += 1; } }
+                        }
+                        digger_idx = self.map.xy_idx(digger_x, digger_y);
+                    }
+                    self.paint(digger_x, digger_y);
+                }
+
+                DLAAlgorithm::CentralAttractor => {
+                    let mut digger_x = rng.roll_dice(1, self.map.width - 3) + 1;
+                    let mut digger_y = rng.roll_dice(1, self.map.height - 3) + 1;
+                    let mut prev_x = digger_x;
+                    let mut prev_y = digger_y;
+                    let mut digger_idx = self.map.xy_idx(digger_x, digger_y);
+
+                    let mut path = rltk::line2d(
+                        rltk::LineAlg::Bresenham, 
+                        rltk::Point::new( digger_x, digger_y ), 
+                        rltk::Point::new( self.starting_position.x, self.starting_position.y )
+                    );
+
+                    while self.map.tiles[digger_idx] == TileType::Wall && !path.is_empty() {
+                        prev_x = digger_x;
+                        prev_y = digger_y;
+                        digger_x = path[0].x;
+                        digger_y = path[0].y;
+                        path.remove(0);
+                        digger_idx = self.map.xy_idx(digger_x, digger_y);
+                    }
+                    self.paint(prev_x, prev_y);
                 }
-                digger_idx = self.map.xy_idx(digger_x, digger_y);
             }
-            let prev_idx = self.map.xy_idx(prev_x, prev_y);
-            self.map.tiles[prev_idx] = TileType::Floor;
 
             self.take_snapshot();
 
@@ -113,4 +228,65 @@ impl DLABuilder {
         // Now we build a noise map for use in spawning entities later
         self.noise_areas = generate_voronoi_spawn_regions(&self.map, &mut rng);
     }
+
+    fn paint(&mut self, x: i32, y:i32) {
+        match self.symmetry {
+            DLASymmetry::None => self.apply_paint(x, y),
+            DLASymmetry::Horizontal => {
+                let center_x = self.map.width / 2;
+                if x == center_x {
+                    self.apply_paint(x, y);                    
+                } else {
+                    let dist_x = i32::abs(center_x - x);
+                    self.apply_paint(center_x + dist_x, y);
+                    self.apply_paint(center_x - dist_x, y);
+                }
+            }
+            DLASymmetry::Vertical => {
+                let center_y = self.map.height / 2;
+                if y == center_y {
+                    self.apply_paint(x, y);
+                } else {
+                    let dist_y = i32::abs(center_y - y);
+                    self.apply_paint(x, center_y + dist_y);
+                    self.apply_paint(x, center_y - dist_y);
+                }
+            }
+            DLASymmetry::Both => {
+                let center_x = self.map.width / 2;
+                let center_y = self.map.height / 2;
+                if x == center_x && y == center_y {
+                    self.apply_paint(x, y);
+                } else {
+                    let dist_x = i32::abs(center_x - x);
+                    self.apply_paint(center_x + dist_x, y);
+                    self.apply_paint(center_x - dist_x, y);
+                    let dist_y = i32::abs(center_y - y);
+                    self.apply_paint(x, center_y + dist_y);
+                    self.apply_paint(x, center_y - dist_y);
+                }
+            }
+        }
+    }
+
+    fn apply_paint(&mut self, x: i32, y: i32) {
+        match self.brush_size {
+            1 => {
+                let digger_idx = self.map.xy_idx(x, y);
+                self.map.tiles[digger_idx] = TileType::Floor;
+            }
+
+            _ => {
+                let half_brush_size = self.brush_size / 2;
+                for brush_y in y-half_brush_size .. y+half_brush_size {
+                    for brush_x in x-half_brush_size .. x+half_brush_size {
+                        if brush_x > 1 && brush_x < self.map.width-1 && brush_y > 1 && brush_y < self.map.height-1 {
+                            let idx = self.map.xy_idx(brush_x, brush_y);
+                            self.map.tiles[idx] = TileType::Floor;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

chapter-30-dla/src/map_builders/mod.rs

@@ -27,9 +27,8 @@ pub trait MapBuilder {
 }
 
 pub fn random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
-    /*
     let mut rng = rltk::RandomNumberGenerator::new();
-    let builder = rng.roll_dice(1, 8);
+    let builder = rng.roll_dice(1, 12);
     match builder {
         1 => Box::new(BspDungeonBuilder::new(new_depth)),
         2 => Box::new(BspInteriorBuilder::new(new_depth)),
@@ -38,8 +37,11 @@ pub fn random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
         5 => Box::new(DrunkardsWalkBuilder::open_halls(new_depth)),
         6 => Box::new(DrunkardsWalkBuilder::winding_passages(new_depth)),
         7 => Box::new(MazeBuilder::new(new_depth)),
+        8 => Box::new(DLABuilder::walk_inwards(new_depth)),
+        9 => Box::new(DLABuilder::walk_outwards(new_depth)),
+        10 => Box::new(DLABuilder::central_attractor(new_depth)),
+        11 => Box::new(DLABuilder::insectoid(new_depth)),
         _ => Box::new(SimpleMapBuilder::new(new_depth))
-    }*/
-    Box::new(DLABuilder::new(new_depth))
+    }
 }