creation of adam2 map

control.lua

@@ -56,7 +56,43 @@ for _, w in pairs(hodor_messages) do
     message_weight_sum = message_weight_sum + w[2]
 end
 
-function hodor(event)
+global.naughty_words_enabled = true
+global.naughty_words = {
+    ['ass'] = true,
+    ['bugger'] = true,
+    ['christ'] = true,
+    ['crikey'] = true,
+    ['darn'] = true,
+    ['dam'] = true,
+    ['damn'] = true,
+    ['dang'] = true,
+    ['dagnabit'] = true,
+    ['dagnabbit'] = true,
+    ['drat'] = true,
+    ['feck'] = true,
+    ['frack'] = true,
+    ['frick'] = true,
+    ['gee'] = true,
+    ['geez'] = true,
+    ['git'] = true,
+    ['god'] = true,
+    ['golly'] = true,
+    ['gosh'] = true,
+    ['heavens'] = true,
+    ['heck'] = true,
+    ['hell'] = true,
+    ['holy'] = true,
+    ['jerk'] = true,
+    ['jesus'] = true,
+    ['petes'] = true,
+    ["pete's"] = true,
+    ['poo'] = true,
+    ['willy'] = true,
+    ['wee'] = true,
+    ['yikes'] = true
+}
+
+local function hodor(event)
     local message = event.message:lower()
     if message:match('hodor') then
         local index = math.random(1, message_weight_sum)
@@ -65,14 +101,28 @@ function hodor(event)
             message_weight_sum = message_weight_sum + m[2]
             if message_weight_sum >= index then
                 game.print('Hodor: ' .. m[1])
-                return
+                break
             end
         end
     end
+
+    local player = game.players[event.player_index]
+    if not player or not player.valid then
+        return
+    end
+
     if message:match('discord') then
-        if game.player then
-            game.player.print('Did you ask about our discord server?')
-            game.player.print('You can find it here: redmew/discord')
+        player.print('Did you ask about our discord server?')
+        player.print('You can find it here: redmew/discord')
+    end
+
+    if global.naughty_words_enabled then
+        local naughty_words = global.naughty_words
+        for word in message:gmatch('%S+') do
+            if naughty_words[word] then
+                game.print(player.name .. ' this is a Christian Factorio server, no swearing please!')
+                break
+            end
         end
     end
 end

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

@@ -0,0 +1,32 @@
+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"
+
+pic = b.decompress(pic)
+
+local shape = b.picture(pic)
+
+--map = b.change_map_gen_collision_tile(map, "water-tile", "grass-1")
+
+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--
@@ -29,6 +29,7 @@ local tiles_per_tick = 32
 --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.creation_of_adam2"
 --shape = require "map_gen.presets.manhattan"
 --shape = require "map_gen.presets.mona_lisa"
 --shape = require "map_gen.presets.connected_dots"

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
 }