From 033ed6ea11470a075505256067d1b7ee67885599 Mon Sep 17 00:00:00 2001
From: James Gillham <jrdgillham@gmail.com>
Date: Fri, 18 Aug 2017 00:48:17 +0100
Subject: [PATCH] removed test.lua and picture_test.lua

---
 .../presets/picture_test.lua                  | 12 --------
 .../grilledham_map_gen/presets/test.lua       | 29 -------------------
 map_layout.lua                                |  2 --
 3 files changed, 43 deletions(-)
 delete mode 100644 locale/gen_combined/grilledham_map_gen/presets/picture_test.lua
 delete mode 100644 locale/gen_combined/grilledham_map_gen/presets/test.lua

diff --git a/locale/gen_combined/grilledham_map_gen/presets/picture_test.lua b/locale/gen_combined/grilledham_map_gen/presets/picture_test.lua
deleted file mode 100644
index aca30379..00000000
--- a/locale/gen_combined/grilledham_map_gen/presets/picture_test.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-require "locale.gen_combined.grilledham_map_gen.map_gen"
-require "locale.gen_combined.grilledham_map_gen.builders"
-
-local pic = require "locale.gen_combined.grilledham_map_gen.data.color_mona_lisa"
-
-local scale_factor = 1
-local shape = picture_builder(pic.data, pic.width, pic.height)
-shape = scale(shape, scale_factor, scale_factor)
-
-local map = single_pattern_builder(shape, pic.width * scale_factor, pic.height * scale_factor)
-
-return map
\ No newline at end of file
diff --git a/locale/gen_combined/grilledham_map_gen/presets/test.lua b/locale/gen_combined/grilledham_map_gen/presets/test.lua
deleted file mode 100644
index e994c207..00000000
--- a/locale/gen_combined/grilledham_map_gen/presets/test.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-require "locale.gen_combined.grilledham_map_gen.map_gen"
-require "locale.gen_combined.grilledham_map_gen.builders"
-
-local square = rectangle_builder(32,32)
-local circle = circle_builder(16)
-local path = path_builder(8)
-path = change_tile(path, true, "water")
-
-square = compound_or({square, path})
-circle = compound_or({circle, path})
-
-local pattern = 
-{
-    {square, circle},
-    {circle, square}
-}
-
-local map = grid_pattern_builder(pattern, 2, 2, 64, 64)
-map = rotate(map, degrees(45))
-
-local start = rectangle_builder(48,48)
-
-map = choose(start, start, map)
-
-map = scale(map, 4, 4)
-
-map = change_map_gen_collision_tile(map, "water-tile", "grass")
-
-return map
\ No newline at end of file
diff --git a/map_layout.lua b/map_layout.lua
index 266124e5..08bf758d 100644
--- a/map_layout.lua
+++ b/map_layout.lua
@@ -10,8 +10,6 @@ in this file and your run_*type*_module(event) function will be called.
 --require "locale.gen_combined.island_resort"
 
 --grilledham's maps
---MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.test"
---MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.picture_test"
 --MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.creation_of_adam"
 
 --shapes--