From 88f4703d00c0f3967dc22933798b2ebd77ed4870 Mon Sep 17 00:00:00 2001
From: Linus Probert <linus.probert@gmail.com>
Date: Mon, 4 Mar 2019 13:05:23 +0100
Subject: [PATCH 1/2] Some more fence layouts

---
 data/layoutparser.lua |  2 +-
 data/walllayouts.dat  | 61 ++++++++++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/data/layoutparser.lua b/data/layoutparser.lua
index 3cb29ad..0ef6361 100644
--- a/data/layoutparser.lua
+++ b/data/layoutparser.lua
@@ -152,7 +152,7 @@ function module.load_textures(map)
 	fences = {
 		topleft			= { t_fence, nil, 0, yoffset, true },
 		top				= { t_fence, nil, 16, yoffset, true },
-		single			= { t_wall, nil, 16, yoffset + 16, true },
+		single			= { t_fence, nil, 16, yoffset + 16, true },
 		topright		= { t_fence, nil, 32, yoffset, true },
 		left			= { t_fence, nil, 0, yoffset + 16, true },
 		bottomleft		= { t_fence, nil, 0, yoffset + 32, true },
diff --git a/data/walllayouts.dat b/data/walllayouts.dat
index 9041a53..a4283f7 100644
--- a/data/walllayouts.dat
+++ b/data/walllayouts.dat
@@ -1,25 +1,38 @@
-----------------
-----------------
---#####---###---
---#---#---###---
---#--###--###---
-------#--#------
-------####------
-------------#---
-------------#---
----#---####-#---
-----------------
-----------------
+++++++++++++++++
+++++++++++++++++
+++##--------##++
+++##--------##++
+++------------++
+++------------++
+++------------++
+++------------++
+++##--------##++
+++##--------##++
+++++++++++++++++
+++++++++++++++++
 
-----------------
-----------------
---fffff---fff---
---f---f---fff---
---f--fff--fff---
-------f--f------
-------ffff------
-------------f---
-------------f---
----f---ffff-f---
-----------------
-----------------
+++++++++++++++++
+++++++++++++++++
+++############++
+++#----------#++
+++#-########-#++
+++--#------#-#++
+++--#--------#++
+++#-########-#++
+++#----------#++
+++############++
+++++++++++++++++
+++++++++++++++++
+
+++++++++++++++++
+++++++++++++++++
+++##--------##++
+++##-ffffff-##++
+++---f----f---++
+++--------f---++
+++--------f---++
+++---f----f---++
+++##-ffffff-##++
+++##--------##++
+++++++++++++++++
+++++++++++++++++

From ca41520c064c6f9824b086dcc2d171be88929c24 Mon Sep 17 00:00:00 2001
From: Linus Probert <linus.probert@gmail.com>
Date: Mon, 4 Mar 2019 13:13:58 +0100
Subject: [PATCH 2/2] Wall layouts added to regular build

---
 data/layoutparser.lua   | 29 +++++++++++++++++------------
 data/maproombuilder.lua |  1 +
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/data/layoutparser.lua b/data/layoutparser.lua
index 0ef6361..9037a1b 100644
--- a/data/layoutparser.lua
+++ b/data/layoutparser.lua
@@ -166,21 +166,11 @@ function module.load_textures(map)
 	}
 end
 
-function module.add_pits_to_room(room)
-	--if CURRENT_LEVEL < 2 or random(5) ~= 1 then
-		--return false
-	--end
-
-	local matrix = readLayoutFile("walllayouts.dat")
-	--local matrix = readLayoutFile("pitlayouts.dat")
-
+function draw_layout_to_room(room, matrix)
 	-- Chose a random layout
 	matrix = matrix[random(#matrix)]
 	for i=2,13 do
 		for j=2,10 do
-			if matrix[i][j] ~= nil then
-				io.write("" .. matrix[i][j])
-			end
 			if matrix[i][j] == "p" then
 				setPitTile(room, matrix, i, j);
 			elseif matrix[i][j] == "#" then
@@ -189,9 +179,24 @@ function module.add_pits_to_room(room)
 				setBlockTile(room, matrix, i, j, fences, "f", true)
 			end
 		end
-		print("")
+	end
+end
+
+function module.add_walls_to_room(room)
+	if random(4) ~= 1 then
+		return false
 	end
 
+	draw_layout_to_room(room, readLayoutFile("walllayouts.dat"))
+	return true
+end
+
+function module.add_pits_to_room(room)
+	if CURRENT_LEVEL < 2 or random(5) ~= 1 then
+		return false
+	end
+
+	draw_layout_to_room(room, readLayoutFile("pitlayouts.dat"))
 	return true
 end
 
diff --git a/data/maproombuilder.lua b/data/maproombuilder.lua
index 79d1637..36ca1ad 100644
--- a/data/maproombuilder.lua
+++ b/data/maproombuilder.lua
@@ -353,6 +353,7 @@ local function build_normal_room(room)
 	add_walls_to_room(room)
 	add_exits_to_room(room)
 	local pitsAdded = crumbling or layoutparser.add_pits_to_room(room)
+	layoutparser.add_walls_to_room(room)
 
 	if room.goal then
 		add_level_exit(room)