updates to old maps

map_gen/presets/GoT.lua

@@ -1,6 +1,10 @@
+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"
-require "map_gen.shared.builders"
-map_gen_decoratives = true
+
 local pic = require "map_gen.data.presets.GoT"
 local pic = decompress(pic)
 

map_gen/presets/UK.lua

@@ -1,4 +1,9 @@
-require "map_gen.shared.builders"
+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 pic = require "map_gen.data.presets.UK"
 local pic = decompress(pic)
@@ -13,42 +18,4 @@ map = translate(map, 0, 10)
 -- this sets the tile outside the bounds of the map to deepwater, remove this and it will be void.
 map = change_tile(map, false, "deepwater")
 
-function run_combined_module(event)
-    local area = event.area
-	local surface = event.surface
-    MAP_GEN_SURFACE = surface
-	local tiles = {}
-	local entities = {}
-
-    local top_x = area.left_top.x
-    local top_y = area.left_top.y
-
-    -- place tiles over the edge of chunks to reduce tile artefacts on chunk boundaries.
-    for y = top_y - 1, top_y + 32 do
-        for x = top_x - 1, top_x + 32 do
-
-            -- local coords need to be 'centered' to allow for correct rotation and scaling.
-            local tile, entity = map(x + 0.5, y + 0.5, x, y)
-
-            if type(tile) == "boolean" and not tile then
-                table.insert( tiles, {name = "out-of-map", position = {x, y}} )
-            elseif type(tile) == "string" then
-                table.insert( tiles, {name = tile, position = {x, y}} )
-            end
-
-            if entity then
-                table.insert(entities, entity)
-            end
-        end
-    end
-
-    -- set tiles.
-    surface.set_tiles(tiles, true)
-
-    -- set entities
-    for _, v in ipairs(entities) do
-		if surface.can_place_entity(v) then
-			surface.create_entity(v)
-		end
-	end
-end
+return map

map_gen/presets/antfarm.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.antfarm"
 

map_gen/presets/biome_test.lua

@@ -1,3 +1,8 @@
+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"
 
 map_gen_decoratives = true

map_gen/presets/cage.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.cage"
 

map_gen/presets/connected_dots.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local function no_resources(x, y, world_x, world_y, tile, entity)
     local surface = MAP_GEN_SURFACE

map_gen/presets/creation_of_adam.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.creation_of_adam2"
 

map_gen/presets/goat.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.goat"
 

map_gen/presets/lines_and_balls.lua

@@ -1,10 +1,9 @@
 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.
+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 map_gen, but map_gen_not_threaded may be useful for testing / debugging.
-require "map_gen.shared.generate_not_threaded"
---require "map_gen.shared.generate"
-require "map_gen.shared.builders"
+-- 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 big_circle = circle_builder(150)
 local small_circle = circle_builder(140)

map_gen/presets/manhattan.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.manhattan"
 

map_gen/presets/maori.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.maori"
 

map_gen/presets/mobius_strip.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local inner_circle = invert(circle_builder(48))
 local outer_circle = circle_builder(64)

map_gen/presets/mona_lisa.lua

@@ -1,5 +1,9 @@
+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"
-require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.color_mona_lisa"
 

map_gen/presets/north_america.lua

@@ -1,5 +1,10 @@
+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"
-map_gen_decoratives = true
+
 local pic = require "map_gen.data.presets.north_america"
 local pic = decompress(pic)
 local map = picture_builder(pic)

map_gen/presets/template.lua

@@ -1,7 +1,7 @@
 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 map_gen, but map_gen_not_threaded may be useful for testing / debugging.
+-- 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"
 

map_gen/presets/turkey.lua

@@ -1,6 +1,10 @@
+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"
 
-map_gen_decoratives = true
 local pic = require "map_gen.data.presets.turkey"
 local pic = decompress(pic)