From 6884d804954dca0414a94e6e57c91c05f306c0c9 Mon Sep 17 00:00:00 2001
From: Valansch <mail@maikwild.de>
Date: Mon, 31 Jul 2017 00:37:02 +0200
Subject: [PATCH] mv x_map.lua x_shape.lua mv x_infinite.lua lattice.lua rm
 cross.lua

---
 .../gen_shape/{x_infinite.lua => lattice.lua} |  0
 locale/gen_shape/x_map.lua                    | 29 -------------------
 locale/gen_shape/{cross.lua => x_shape.lua}   |  0
 map_layout.lua                                |  7 ++---
 4 files changed, 3 insertions(+), 33 deletions(-)
 rename locale/gen_shape/{x_infinite.lua => lattice.lua} (100%)
 delete mode 100644 locale/gen_shape/x_map.lua
 rename locale/gen_shape/{cross.lua => x_shape.lua} (100%)

diff --git a/locale/gen_shape/x_infinite.lua b/locale/gen_shape/lattice.lua
similarity index 100%
rename from locale/gen_shape/x_infinite.lua
rename to locale/gen_shape/lattice.lua
diff --git a/locale/gen_shape/x_map.lua b/locale/gen_shape/x_map.lua
deleted file mode 100644
index 05e9f105..00000000
--- a/locale/gen_shape/x_map.lua
+++ /dev/null
@@ -1,29 +0,0 @@
---X shape map script --by Neko_Baron
-
---edit this
-local tiles_wide = 172
-
----dont edit these
-local tiles_half = tiles_wide * 0.5
-
-function run_shape_module(event)
-	local area = event.area
-	local surface = event.surface
-	local tiles = {}
-
-	top_left = area.left_top	--make a more direct reference
-
-	for x = top_left.x-1, top_left.x + 32 do
-		for y = top_left.y-1, top_left.y + 32 do
-		
-			local abs_x = math.abs(x)
-			local abs_y = math.abs(y)
-			if abs_x < abs_y - tiles_half or abs_x > abs_y + tiles_half then
-				table.insert(tiles, {name = "out-of-map", position = {x,y}})
-			end
-		end
-	end
-	surface.set_tiles(tiles)
-
-	return true
-end
\ No newline at end of file
diff --git a/locale/gen_shape/cross.lua b/locale/gen_shape/x_shape.lua
similarity index 100%
rename from locale/gen_shape/cross.lua
rename to locale/gen_shape/x_shape.lua
diff --git a/map_layout.lua b/map_layout.lua
index 1e4018e2..5f7d7557 100644
--- a/map_layout.lua
+++ b/map_layout.lua
@@ -15,10 +15,9 @@ in this file and your run_*type*_module(event) function will be called.
 --require "locale.gen_shape.spiral2"
 --require "locale.gen_shape.donut"
 --require "locale.gen_shape.rectangular_spiral"
---require "locale.gen_shape.x_map"
---require "locale.gen_shape.cross"
---require "locale.gen_shape.infinite_mazes"
---require "locale.gen_shape.x_infinite"
+--require "locale.gen_shape.lattice"
+require "locale.gen_shape.infinite_mazes"
+--require "locale.gen_shape.x_shape"
 
 
 --terrain--