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

Merge branch 'develop' of github.com:ennorehling/eressea into develop

This commit is contained in:
Enno Rehling 2016-09-08 20:44:15 +02:00
parent 51c1ddc98b 9c92582b3a
commit 9f997ed794
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/eressea/autoseed.lua
View File

@ -76,7 +76,7 @@ end
function autoseed.init() function autoseed.init()
-- local newbs = {} -- local newbs = {}
local num_seeded = 0 local num_seeded = per_region
local start = nil local start = nil
eressea.log.info('autoseed new players') eressea.log.info('autoseed new players')
@ -94,8 +94,10 @@ function autoseed.init()
for _, p in ipairs(players) do for _, p in ipairs(players) do
if num_seeded == per_region then if num_seeded == per_region then
local index = rng_int() % #sel local index = rng_int() % #sel
start = nil
while not start do while not start do
start = sel[index + 1] start = sel[index + 1]
sel[index+1] = nil
index = (index + 1) % #sel index = (index + 1) % #sel
end end
num_seeded = 0 num_seeded = 0

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'),