diff --git a/src/scripts/wdw-run.lua b/src/scripts/wdw-run.lua index e2c804904..5331971fc 100644 --- a/src/scripts/wdw-run.lua +++ b/src/scripts/wdw-run.lua @@ -34,9 +34,6 @@ function run_wdw() -- siegbedingungen ausgeben dofile("wdw-standings.lua") - if 1 == 1 then - return -1 - end -- write out the initial reports (no need to run a turn) write_passwords() diff --git a/src/scripts/wdw-setup.lua b/src/scripts/wdw-setup.lua index be7430466..c7c48e982 100644 --- a/src/scripts/wdw-setup.lua +++ b/src/scripts/wdw-setup.lua @@ -19,12 +19,12 @@ function get_position(aid) local pos = positions[aid] -- hack, because i have no coordinates yet: - if pos.terrain ~= "ocean" then + if pos ~= nil and pos.terrain ~= "ocean" then return pos else -- find a region. let's use the region number 'aid' in the list, -- so everyone gets their own - print("cannot place alliance " .. aid .. " at " .. pos.x .. ", " .. pos.y) + -- print("cannot place alliance " .. aid .. " at " .. pos.x .. ", " .. pos.y) for pos in regions() do if pos.terrain ~= "ocean" then if aid==0 then @@ -72,6 +72,7 @@ function make_faction(position, alliance, number, email, race) u:add_item(get_gem(ano), numalliances-1) u:add_item(get_gem(ano+1), 2) u:add_item(get_gem(ano+2), 2) + u:add_item("log", 50) end local sk