From 51a8cf1f207b1c5e7ec0cda6e5d84b9896eb6357 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Thu, 27 Oct 2016 16:12:50 -0400
Subject: [PATCH] Lua Cave Mapgen: Support comma-separated chamber locations

---
 data/lua/cave_map_generator.lua | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/data/lua/cave_map_generator.lua b/data/lua/cave_map_generator.lua
index 47273d8c06cc7..32113bccadf68 100644
--- a/data/lua/cave_map_generator.lua
+++ b/data/lua/cave_map_generator.lua
@@ -42,8 +42,8 @@ function callbacks.generate_map(params)
 
 	for chamber in helper.child_range(params, "chamber") do
 		local chance = tonumber(chamber.chance) or 100
-		local x = chamber.x
-		local y = chamber.y
+		local x = helper.rand(chamber.x)
+		local y = helper.rand(chamber.y)
 		local id = chamber.id
 		if chance == 0 or random(100) > chance then
 			-- Set chance to 0 so that the scenario generator can tell which chambers were used
@@ -52,14 +52,6 @@ function callbacks.generate_map(params)
 		end
 		-- Ditto, set it to 100
 		params.chance = 100
-		if type(x) == "string" then
-			local x_min, x_max = x:match("(%d+)-(%d+)")
-			x = random(tonumber(x_min), tonumber(x_max))
-		end
-		if type(y) == "string" then
-			local y_min, y_max = y:match("(%d+)-(%d+)")
-			y = random(tonumber(y_min), tonumber(y_max))
-		end
 		local locs_set = LS.create()
 		build_chamber(x, y, locs_set, chambers.size or 3, chambers.size or 0)
 		local items = {}