Merge branch 'develop' into scenario/diggy

control.lua

@@ -32,7 +32,6 @@ require 'paint'
 require 'score'
 require 'popup'
 
-
 local Event = require 'utils.event'
 local Donators = require 'resources.donators'
 
@@ -167,7 +166,7 @@ local function player_joined(event)
         return
     end
 
-    game.print(table.concat({'*** ', message, ' ***'}))
+    game.print(table.concat({'*** ', message, ' ***'}), player.chat_color)
 end
 
 Event.add(defines.events.on_player_created, player_created)

info.lua

@@ -21,10 +21,7 @@ local new_info_key = 4
 local welcomed_players = {}
 local editable_info = {
     [map_name_key] = 'This Map has no name',
-    [map_description_key] = [[
-By default this section is blank as it's supposed to be filled out on a per map basis.
-(If you're seeing this message, ping the admin team to get a description added for
-this map)]],
+    [map_description_key] = "By default this section is blank as it's supposed to be filled out on a per map basis. (If you're seeing this message, ping the admin team to get a description added for this map)",
     [map_extra_info_key] = 'This map has no extra infomation',
     [new_info_key] = 'Nothing is new. The world is at peace'
 }
@@ -405,6 +402,7 @@ Shows number of rockets launched and biters liberated.]]
                 text = editable_info[map_name_key]
             }
             map_name_textbox.read_only = read_only
+            map_name_textbox.word_wrap = true
 
             local map_name_textbox_style = map_name_textbox.style
             map_name_textbox_style.width = text_width
@@ -420,6 +418,7 @@ Shows number of rockets launched and biters liberated.]]
                 text = editable_info[map_description_key]
             }
             map_description_textbox.read_only = read_only
+            map_description_textbox.word_wrap = true
 
             local map_description_textbox_style = map_description_textbox.style
             map_description_textbox_style.width = text_width
@@ -435,6 +434,7 @@ Shows number of rockets launched and biters liberated.]]
                 text = editable_info[map_extra_info_key]
             }
             map_extra_info_textbox.read_only = read_only
+            map_extra_info_textbox.word_wrap = true
 
             local map_extra_info_textbox_style = map_extra_info_textbox.style
             map_extra_info_textbox_style.width = text_width
@@ -705,7 +705,7 @@ Gui.on_custom_close(
 
 local Public = {}
 
-function Public.get_map_name() 
+function Public.get_map_name()
     return editable_info[map_name_key]
 end
 
@@ -713,7 +713,7 @@ function Public.set_map_name(value)
     editable_info[map_name_key] = value
 end
 
-function Public.get_map_description() 
+function Public.get_map_description()
     return editable_info[map_description_key]
 end
 
@@ -721,7 +721,7 @@ function Public.set_map_description(value)
     editable_info[map_description_key] = value
 end
 
-function Public.get_map_extra_info() 
+function Public.get_map_extra_info()
     return editable_info[map_extra_info_key]
 end
 
@@ -729,7 +729,7 @@ function Public.set_map_extra_info(value)
     editable_info[map_extra_info_key] = value
 end
 
-function Public.get_new_info() 
+function Public.get_new_info()
     return editable_info[new_info_key]
 end
 

map_gen/presets/beach.lua

@@ -91,7 +91,7 @@ sand_shape = b.apply_entity(sand_shape, do_ores)
 
 water_shape = b.change_tile(water_shape, true, 'water')
 
-local oil = b.resource(b.full_shape, 'crude-oil', value(500000, 2500))
+local oil = b.resource(b.full_shape, 'crude-oil', value(300000, 2000))
 local function do_oil(x, y, world)
     if math.random(16384) == 1 then
         local e = oil(x, y, world)

map_gen/presets/double_beach.lua

@@ -0,0 +1,15 @@
+local b = require 'map_gen.shared.builders'
+
+local beach = require 'map_gen.presets.beach'
+
+local start_pound = b.circle(6)
+start_pound = b.translate(start_pound, 0, -16)
+start_pound = b.change_tile(start_pound, true, 'water')
+
+beach = b.translate(beach, 0, -64)
+
+local map = b.any {start_pound, beach, b.translate(b.flip_y(beach), -51200, 0)}
+
+map = b.rotate(map, degrees(45))
+
+return map

map_layout.lua

@@ -69,6 +69,7 @@ require "map_gen.combined.diggy"
 --shape = require "map_gen.presets.line_and_tree"
 --shape = require "map_gen.presets.square_spiral"
 --shape = require "map_gen.presets.beach"
+--shape = require "map_gen.presets.double_beach"
 --shape = require "map_gen.presets.factory"
 --shape = require "map_gen.presets.triangle_of_death"
 --shape = require "map_gen.presets.world_map"

nuke_control.lua

@@ -143,7 +143,15 @@ local function on_capsule_used(event)
   end
 end
 
+local function on_player_joined(event)
+  local player = game.players[event.player_index]
+  if string.match(player.name,"^[Ili1|]+$") then
+    game.ban_player(player) --No reason given, to not give them any hints to change their name
+  end
+end
+
 Event.add(defines.events.on_player_ammo_inventory_changed, ammo_changed)
+Event.add(defines.events.on_player_joined_game, on_player_joined)
 Event.add(defines.events.on_player_deconstructed_area, on_player_deconstructed_area)
 --Event.add(defines.events.on_player_mined_entity, on_player_mined_item)
 Event.add(defines.events.on_player_used_capsule, on_capsule_used)

resources/donators.lua

@@ -25,7 +25,8 @@ Module.donators = {
 Module.welcome_messages = {
     ['Linaori'] = 'I present to you Linaori of house Refactorio, Lady of the Void, Remover of Spaghetti, Queen of the Endless Nauvis, Breaker of Biters and Mother of Code!',
     ['Valansch'] = 'Welcome Valansch, <insert custom welcome message here>.',
-    ['der-dave.com'] = "Dave doesn't want a welcome message."
+    ['der-dave.com'] = 'Dave doesn\'t want a welcome message.',
+    ['robertkruijt'] = 'The general of the army has arived!'
 }
 
 return Module

resources/regulars.lua

@@ -979,5 +979,24 @@ return {
     ['crayzz2'] = true,
     ['Gerkiz'] = true,
     ['piterfersin'] = true,
-    ['SiMoZ_287'] = true
+    ['SiMoZ_287'] = true,
+    ['SSeltmann'] = true,
+    ['AbsoluteZeroIs0K'] = true,
+    ['jufacto'] = true,
+    ['okan009'] = true,
+    ['CounterfeitThe'] = true,
+    ['TZsec'] = true,
+    ['jamesh92'] = true,
+    ['Flameoguy'] = true,
+    ['Toledini'] = true,
+    ['alnmike'] = true,
+    ['Krzys132'] = true,
+    ['jrz126'] = true,
+    ['Rothguard'] = true,
+    ['Rascher'] = true,
+    ['XeoXius'] = true,
+    ['InphinitePhractals'] = true,
+    ['Breadface'] = true,
+    ['safariursis'] = true,
+    ['Marucan'] = true
 }