Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop 

Conflicts:
	src/buildno.h
This commit is contained in:
Enno Rehling 2016-05-17 15:47:21 +02:00
parent 741804d98d b5a84f07ba
commit e6aec1dde4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/eressea/autoseed.lua
View File

@ -39,7 +39,7 @@ local function read_players()
local str = input:read("*line") local str = input:read("*line")
if str==nil then break end if str==nil then break end
local email, race, lang = str:match("([^ ]*) ([^ ]*) ([^ ]*)") local email, race, lang = str:match("([^ ]*) ([^ ]*) ([^ ]*)")
if string.char(string.byte(email, 1))~='#' then if email and string.char(string.byte(email, 1))~='#' then
table.insert(players, { race = race, lang = lang, email = email }) table.insert(players, { race = race, lang = lang, email = email })
end end
end end
@ -69,12 +69,12 @@ end
function autoseed.init() function autoseed.init()
-- local newbs = {} -- local newbs = {}
local num_seeded = 2 local num_seeded = per_region
local start = nil local start = nil
eressea.log.info('autoseed new players') eressea.log.info('autoseed new players')
players = read_players() players = read_players()
if players and #players > 0 then if players and #players >= per_region then
local sel local sel
eressea.log.info(#players .. ' new players') eressea.log.info(#players .. ' new players')
sel = select_regions(regions(), peasants, trees) sel = select_regions(regions(), peasants, trees)

2
scripts/eressea/e2/init.lua
View File

@ -3,7 +3,7 @@ eressea.log.debug("rules for game E2")
return { return {
require('eressea'), require('eressea'),
require('eressea.autoseed'), -- require('eressea.autoseed'),
require('eressea.xmas'), require('eressea.xmas'),
require('eressea.xmasitems'), require('eressea.xmasitems'),
require('eressea.wedding'), require('eressea.wedding'),