merge creation of adam 2

control.lua

@@ -60,6 +60,7 @@ global.naughty_words_enabled = true
 global.naughty_words = {
     ['ass'] = true,
     ['bugger'] = true,
+    ['christ'] = true,
     ['crikey'] = true,
     ['darn'] = true,
     ['dam'] = true,

map_gen/ores/fluffy_rainbows.lua

@@ -14,7 +14,8 @@ local ore_base_amounts = {
 }
 
 local function init()
-    global.perlin_noise_seed = math.random(1000, 1000000)
+    global.perlin_noise_seed = game.surfaces[1].map_gen_settings.seed
+    -- math.random(1000, 1000000)
 end
 
 Event.on_init(init)
@@ -38,12 +39,12 @@ return function(x, y, world)
         world.amount_distance_multiplicator = amount_distance_multiplicator
     end
 
-    local entities = world.surface.find_entities_filtered {position = {world.x + 0.5, world.y + 0.5}, type = 'resource'}
+    --[[ local entities = world.surface.find_entities_filtered {position = {world.x + 0.5, world.y + 0.5}, type = 'resource'}
     for _, e in ipairs(entities) do
         if e.name ~= 'crude-oil' then
             e.destroy()
         end
-    end
+    end ]]
 
     local seed = global.perlin_noise_seed
 
@@ -51,9 +52,9 @@ return function(x, y, world)
     local noise_terrain_2 = perlin:noise(((x + seed) / 50), ((y + seed) / 50), 0)
     local noise_terrain = noise_terrain_1 + (noise_terrain_2 * 0.01)
 
-    return do_resource('iron-ore', x, y, world, noise_terrain, 0.1, 0.075, seed) or
-        do_resource('copper-ore', x, y, world, noise_terrain, 0.075, 0.05, seed) or
-        do_resource('stone', x, y, world, noise_terrain, 0.05, 0.04, seed) or
-        do_resource('coal', x, y, world, noise_terrain, 0.04, 0.03, seed) or
+    return do_resource('iron-ore', x, y, world, noise_terrain, 0.11, 0.085, seed) or
+        do_resource('copper-ore', x, y, world, noise_terrain, 0.085, 0.06, seed) or
+        do_resource('stone', x, y, world, noise_terrain, 0.06, 0.05, seed) or
+        do_resource('coal', x, y, world, noise_terrain, 0.05, 0.03, seed) or
         do_resource('uranium-ore', x, y, world, noise_terrain, 0.02, 0.01, seed)
 end

map_gen/presets/creation_of_adam2.lua

@@ -1,10 +1,32 @@
-local b = require "map_gen.shared.builders"
+local b = require 'map_gen.shared.builders'
+
+local pic = require 'map_gen.data.presets.creation_of_adam2'
+--local pic = require "map_gen.data.presets.sistine_chapel_ceiling"
 
-local pic = require "map_gen.data.presets.creation_of_adam2"
 pic = b.decompress(pic)
 
 local shape = b.picture(pic)
 
 --map = b.change_map_gen_collision_tile(map, "water-tile", "grass-1")
 
-return shape
+local pattern = {
+    {shape, b.flip_x(shape)},
+    {b.flip_y(shape), b.flip_xy(shape)}
+}
+
+local map = b.grid_pattern(pattern, 2, 2, pic.width - 1, pic.height - 1)
+
+map = b.translate(map, 222, 64)
+
+local rainbows = require 'map_gen.ores.fluffy_rainbows'
+
+local rainbow1 = b.translate(rainbows, 1000000, 1000000)
+local rainbow2 = b.translate(rainbows, 2000000, 2000000)
+rainbow2 = b.rotate(rainbow2, degrees(45))
+rainbow2 = b.scale(rainbow2, 0.5)
+
+map = b.apply_entities(map, {rainbow1, rainbow2})
+
+map = b.fish(map, 0.00125)
+
+return map

map_layout.lua

@@ -8,7 +8,7 @@ in this file and your run_*type*_module(event) function will be called.
 local b = require 'map_gen.shared.builders'
 
 local shape = nil
-local regen_decoratives = false
+local regen_decoratives = true
 local tiles_per_tick = 32
 
 --combined--

resources/regulars.lua

@@ -264,5 +264,18 @@ return {
     ['chukles'] = true,
     ['frissi'] = true,
     ['df1229'] = true,
-    ['actitishypoleucos'] = true
+    ['actitishypoleucos'] = true,
+    ['angus100'] = true,
+    ['morgan3rd'] = true,
+    ['kyte'] = true,
+    ['olexn'] = true,
+    ['acolyteofcthulu'] = true,
+    ['mariocraft2001'] = true,
+    ['krul'] = true,
+    ['b4x'] = true,
+    ['firebunnie'] = true,
+    ['derdu'] = true,
+    ['nibu'] = true,
+    ['artman40'] = true,
+    ['junhinhow'] = true
 }