moved generate out of presets

control.lua

@@ -20,7 +20,7 @@ require "tasklist"
 require "autodeconstruct"
 require "corpse_util"
 require "reactor_meltdown"
-require "screenshot"
+--require "screenshot"
 local Event = require "utils.event"
 
 local function player_joined(event)

map_gen/presets/ContraSpiral.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.CSrMap"

map_gen/presets/GoT.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.GoT"

map_gen/presets/UK.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.UK"

map_gen/presets/antfarm.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.antfarm"

map_gen/presets/broken_web.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.broken_web"

map_gen/presets/connected_dots.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local function no_resources(x, y, world, tile)

map_gen/presets/cookies.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local seed1 = 666

map_gen/presets/creation_of_adam.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
-require "map_gen.shared.generate_not_threaded"
---require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.creation_of_adam"

map_gen/presets/crosses.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.crosses"

map_gen/presets/crosses3.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local scale_factor = 64

map_gen/presets/dickbutt.lua

@@ -2,13 +2,6 @@
 This map uses custom ore gen. When generating the map, under the resource settings tab use Size = 'None' for iron, copper, stone and coal.
 ]]
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local body = b.rotate(b.oval(128,256), degrees(20))

map_gen/presets/dna.lua

@@ -2,13 +2,6 @@
 This map uses custom ore gen. When generating the map, under the resource settings tab use Size = 'None' for all resources.
 ]]
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local ball_r = 16

map_gen/presets/factorio_logo.lua

@@ -5,13 +5,6 @@ local scale_factor = 6
 local island_distance_x = 256
 local island_distance_y = 128
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.factorio_logo"

map_gen/presets/factorio_logo2.lua

@@ -5,13 +5,6 @@ local scale_factor = 6
 local island_distance_x = 256
 local island_distance_y = 128
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.factorio_logo2"

map_gen/presets/fish_islands.lua

@@ -3,12 +3,6 @@ This map uses custom ore gen. When generating the map, under the resource settin
 This map removes and adds it's own water, in terrain settings use water frequency = very low and water size = only in starting area.
 This map has isolated areas, it's recommend turning biters to peaceful to reduce stress on the pathfinder.
 ]]
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
 
 local b = require "map_gen.shared.builders"
 

map_gen/presets/fractal_balls.lua

@@ -1,7 +1,3 @@
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local function value(base, mult)

map_gen/presets/fruit_loops.lua

@@ -3,12 +3,6 @@ This map uses custom ore gen. When generating the map, under the resource settin
 This map removes and adds it's own water, in terrain settings use water frequency = very low and water size = only in starting area.
 This map has isolated areas, it's recommend turning biters to peaceful to reduce stress on the pathfinder.
 ]]
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
 
 local b = require "map_gen.shared.builders"
 

map_gen/presets/gears.lua

@@ -2,13 +2,6 @@
     This map removes and adds it's own water, in terrain settings use water frequency = very low and water size = only in starting area.
  ]]
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.gears"

map_gen/presets/goat.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
-require "map_gen.shared.generate_not_threaded"
---require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.goat"

map_gen/presets/goats_on_goats.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.goat"

map_gen/presets/grid_islands.lua

@@ -2,13 +2,6 @@
 This map uses custom ore gen. When generating the map, under the resource settings tab use Size = 'None' for all resources.
 ]]
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local square = b.rectangle(160,160)

map_gen/presets/hearts.lua

@@ -1,7 +1,3 @@
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local circle = b.circle(16)

map_gen/presets/honeycomb.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.honeycomb"

map_gen/presets/line_and_trees.lua

@@ -1,9 +1,3 @@
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
-local b = require "map_gen.shared.builders"
-
 local seed1 = 420420
 local seed2 = 696969
 

map_gen/presets/lines.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.lines"

map_gen/presets/lines_and_balls.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local big_circle = b.circle(150)

map_gen/presets/manhattan.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.manhattan"

map_gen/presets/maori.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.maori"

map_gen/presets/misc_stuff.lua

@@ -2,13 +2,6 @@
     This map removes and adds it's own water, in terrain settings use water frequency = very low and water size = only in starting area.
  ]]
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.misc_stuff"

map_gen/presets/mobius_strip.lua

@@ -1,12 +1,5 @@
 local Event = require "utils.event"
 
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local inner_circle = b.invert(b.circle(48))

map_gen/presets/mona_lisa.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.mona_lisa"

map_gen/presets/north_america.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.north_america"

map_gen/presets/plus.lua

@@ -1,7 +1,3 @@
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
-require "map_gen.shared.generate_not_threaded"
---require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.plus" --or whatever you called it in data->presets

map_gen/presets/ring_of_balls.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local ball = b.circle(16)

map_gen/presets/rings_and_boxes.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local small_circle = b.circle(16)

map_gen/presets/template.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.template"

map_gen/presets/test.lua

@@ -1,5 +1,3 @@
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local land = b.rectangle(32,16)

map_gen/presets/turkey.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.turkey"

map_gen/presets/venice.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.venice"

map_gen/presets/void_gears.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.void_gears"

map_gen/presets/web.lua

@@ -1,10 +1,3 @@
-map_gen_decoratives = false -- Generate our own decoratives
-map_gen_rows_per_tick = 8 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
-
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local stripe_thickness = 24

map_gen/presets/women.lua

@@ -1,7 +1,3 @@
--- Recommend to use generate, but generate_not_threaded may be useful for testing / debugging.
---require "map_gen.shared.generate_not_threaded"
-require "map_gen.shared.generate"
-
 local b = require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.woman"

map_gen/shared/generate.lua

@@ -3,8 +3,7 @@ require("utils.poisson_rng")
 
 local Task = require "utils.Task"
 
-map_gen_rows_per_tick = map_gen_rows_per_tick or 4
-map_gen_rows_per_tick = math.min(32, math.max(1, map_gen_rows_per_tick))
+local shape
 
 local function do_row(row, data)
     local function do_tile(tile, x, y)
@@ -24,7 +23,7 @@ local function do_row(row, data)
         data.x = x
 
         -- local coords need to be 'centered' to allow for correct rotation and scaling.
-        local tile = MAP_GEN(x + 0.5, y + 0.5, data)
+        local tile = shape(x + 0.5, y + 0.5, data)
 
         if type(tile) == "table" then
             do_tile(tile.tile, x, y)
@@ -118,12 +117,7 @@ function map_gen_action(data)
     end
 end
 
-function run_combined_module(event)
-    if MAP_GEN == nil then
-        game.print("MAP_GEN not set")
-        return
-    end
-
+local function on_chunk(event)
     local area = event.area
 
     local data = {
@@ -329,7 +323,7 @@ local entity_options = {
     ["out-of-map"] = {}
 }
 
-function check_entities(tile, x, y)
+local function check_entities(tile, x, y)
     local options = entity_options[tile]
     local tile_entity_list = {}
 
@@ -343,3 +337,10 @@ function check_entities(tile, x, y)
 
     return tile_entity_list
 end
+
+local function init(s)
+    shape = s
+    return on_chunk
+end
+
+return init

map_gen/shared/generate_not_threaded.lua

@@ -1,6 +1,8 @@
 require("map_gen.shared.builders")
 require("utils.poisson_rng")
 
+local shape
+
 local function do_row(row, data)
     local function do_tile(tile, x, y)
         if not tile then
@@ -19,7 +21,7 @@ local function do_row(row, data)
         data.x = x
 
         -- local coords need to be 'centered' to allow for correct rotation and scaling.
-        local tile, entity = MAP_GEN(x + 0.5, y + 0.5, data)
+        local tile, entity = shape(x + 0.5, y + 0.5, data)
 
         if type(tile) == "table" then
             do_tile(tile.tile, x, y)
@@ -74,12 +76,7 @@ local function do_place_entities(data)
     end
 end
 
-function run_combined_module(event)
-    if MAP_GEN == nil then
-        game.print("MAP_GEN not set")
-        return
-    end
-
+local function on_chunk(event)
     local area = event.area   
 
     local data = {
@@ -291,7 +288,7 @@ local entity_options = {
     ["out-of-map"] = {}
 }
 
-function check_entities(tile, x, y)
+local function check_entities(tile, x, y)
     local options = entity_options[tile]
     local tile_entity_list = {}
 
@@ -305,3 +302,10 @@ function check_entities(tile, x, y)
 
     return tile_entity_list
 end
+
+local function init(s)
+    shape = s
+    return on_chunk
+end
+
+return init

map_layout.lua

@@ -16,50 +16,49 @@ local Event = require "utils.event"
 --require "map_gen.combined.meteor_strike" --unfinished
 
 --presets--
---MAP_GEN = require "map_gen.presets.template"
---MAP_GEN = require "map_gen.presets.web" --unfinished
---MAP_GEN = require "map_gen.presets.rings_and_boxes" --unfinished
---MAP_GEN = require "map_gen.presets.ring_of_balls" --unfinished
---MAP_GEN = require "map_gen.presets.dna"
---MAP_GEN = require "map_gen.presets.lines_and_balls"
---MAP_GEN = require "map_gen.presets.mobius_strip"
---MAP_GEN = require "map_gen.presets.antfarm"
---MAP_GEN = require "map_gen.presets.creation_of_adam"
---MAP_GEN = require "map_gen.presets.manhattan"
---MAP_GEN = require "map_gen.presets.mona_lisa"
---MAP_GEN = require "map_gen.presets.connected_dots"
---MAP_GEN = require "map_gen.presets.maori"
---MAP_GEN = require "map_gen.presets.goat"
---MAP_GEN = require "map_gen.presets.GoT"
---MAP_GEN = require "map_gen.presets.turkey" -- needs to be rebuilt from missing source image.
---MAP_GEN = require "map_gen.presets.north_america" -- needs to be rebuilt from missing source image.
---MAP_GEN = require "map_gen.presets.UK"
---MAP_GEN = require "map_gen.presets.venice"
---MAP_GEN = require "map_gen.presets.goats_on_goats"
---MAP_GEN = require "map_gen.presets.grid_islands"
---MAP_GEN = require "map_gen.presets.crosses"
---MAP_GEN = require "map_gen.presets.crosses3"
---MAP_GEN = require "map_gen.presets.broken_web"
---MAP_GEN = require "map_gen.presets.misc_stuff"
---MAP_GEN = require "map_gen.presets.lines"
---MAP_GEN = require "map_gen.presets.dickbutt"
---MAP_GEN = require "map_gen.presets.void_gears"
---MAP_GEN = require "map_gen.presets.gears"
---MAP_GEN = require "map_gen.presets.factorio_logo"
---MAP_GEN = require "map_gen.presets.factorio_logo2"
---MAP_GEN = require "map_gen.presets.hearts"
---MAP_GEN = require "map_gen.presets.women"
---MAP_GEN = require "map_gen.presets.fractal_balls"
---MAP_GEN = require "map_gen.presets.fruit_loops"
---MAP_GEN = require "map_gen.presets.fish_islands"
---MAP_GEN = require "map_gen.presets.ContraSpiral"
---MAP_GEN = require "map_gen.presets.cookies"
---MAP_GEN = require "map_gen.presets.plus"
---MAP_GEN = require "map_gen.presets.honeycomb"
---MAP_GEN = require "map_gen.presets.line_and_trees"
---MAP_GEN = require "map_gen.presets.test"
-
-
+local shape = nil
+--shape = require "map_gen.presets.template"
+--shape = require "map_gen.presets.web" --unfinished
+--shape = require "map_gen.presets.rings_and_boxes" --unfinished
+--shape = require "map_gen.presets.ring_of_balls" --unfinished
+--shape = require "map_gen.presets.dna"
+--shape = require "map_gen.presets.lines_and_balls"
+--shape = require "map_gen.presets.mobius_strip"
+--shape = require "map_gen.presets.antfarm"
+--shape = require "map_gen.presets.creation_of_adam"
+--shape = require "map_gen.presets.manhattan"
+--shape = require "map_gen.presets.mona_lisa"
+--shape = require "map_gen.presets.connected_dots"
+--shape = require "map_gen.presets.maori"
+--shape = require "map_gen.presets.goat"
+--shape = require "map_gen.presets.GoT"
+--shape = require "map_gen.presets.turkey" -- needs to be rebuilt from missing source image.
+--shape = require "map_gen.presets.north_america" -- needs to be rebuilt from missing source image.
+--shape = require "map_gen.presets.UK"
+--shape = require "map_gen.presets.venice"
+--shape = require "map_gen.presets.goats_on_goats"
+--shape = require "map_gen.presets.grid_islands"
+--shape = require "map_gen.presets.crosses"
+--shape = require "map_gen.presets.crosses3"
+--shape = require "map_gen.presets.broken_web"
+--shape = require "map_gen.presets.misc_stuff"
+--shape = require "map_gen.presets.lines"
+--shape = require "map_gen.presets.dickbutt"
+--shape = require "map_gen.presets.void_gears"
+--shape = require "map_gen.presets.gears"
+--shape = require "map_gen.presets.factorio_logo"
+--shape = require "map_gen.presets.factorio_logo2"
+--shape = require "map_gen.presets.hearts"
+--shape = require "map_gen.presets.women"
+--shape = require "map_gen.presets.fractal_balls"
+--shape = require "map_gen.presets.fruit_loops"
+--shape = require "map_gen.presets.fish_islands"
+--shape = require "map_gen.presets.ContraSpiral"
+--shape = require "map_gen.presets.cookies"
+--shape = require "map_gen.presets.plus"
+--shape = require "map_gen.presets.honeycomb"
+--shape = require "map_gen.presets.line_and_trees"
+--shape = require "map_gen.presets.test"
 
 --shapes--
 --require "map_gen.shape.left"
@@ -97,7 +96,15 @@ miscs = {}
 --table.insert(miscs, require("map_gen.misc.tris_chunk_grid"))
 --table.insert(miscs, require("map_gen.ores.glitter_ores"))
 
-local on_chunk_generated = function(event)
+if shape then
+	local gen = require "map_gen.shared.generate"
+	--local gen = require "map_gen.shared.generate_not_threaded"
+
+	gen = gen(shape)
+	Event.add(defines.events.on_chunk_generated, gen)
+end
+
+--[[ local on_chunk_generated = function(event)
 	if run_combined_module ~= nil then
 		run_combined_module(event)
 	end
@@ -115,4 +122,4 @@ local on_chunk_generated = function(event)
 	end
 end
 
-Event.add(defines.events.on_chunk_generated, on_chunk_generated)
+Event.add(defines.events.on_chunk_generated, on_chunk_generated) ]]