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

Merge pull request #159 from badgerman/develop

Browse source 
remove the change_locales code
This commit is contained in:
Enno Rehling 2015-04-04 09:21:42 +02:00
commit bd3c9f1fcb
1 changed files with 43 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
scripts/run-turn.lua
View file

@ -26,18 +26,6 @@ function callbacks(rules, name, ...)
end end
end end
local function change_locales(localechange)
for loc, flist in pairs(localechange) do
for index, name in pairs(flist) do
f = get_faction(atoi36(name))
if f ~= nil and f.locale ~= loc then
print("LOCALECHANGE ", f, f.locale, loc)
f.locale = loc
end
end
end
end
local function dbupdate() local function dbupdate()
update_scores() update_scores()
dbname = config.dbname or 'eressea.db' dbname = config.dbname or 'eressea.db'
@ -127,64 +115,65 @@ local function write_scores()
end end
function process(rules, orders) function process(rules, orders)
local confirmed_multis = { } local confirmed_multis = { }
local suspected_multis = { } local suspected_multis = { }
if open_game(get_turn())~=0 then if open_game(get_turn())~=0 then
eressea.log.error("could not read game") eressea.log.error("could not read game")
return -1 return -1
end end
callbacks(rules, 'init') callbacks(rules, 'init')
init_summary() init_summary()
-- run the turn: -- run the turn:
if read_orders(orders) ~= 0 then if read_orders(orders) ~= 0 then
print("could not read " .. orders) print("could not read " .. orders)
return -1 return -1
end end
plan_monsters() plan_monsters()
if nmr_check(config.maxnmrs or 80)~=0 then if nmr_check(config.maxnmrs or 80)~=0 then
return -1 return -1
end end
process_orders() process_orders()
callbacks(rules, 'update') callbacks(rules, 'update')
local localechange = { de = { 'ii' } } write_files(config.locales)
change_locales(localechange)
write_files(config.locales) file = '' .. get_turn() .. '.dat'
if eressea.write_game(file)~=0 then
file = '' .. get_turn() .. '.dat' eressea.log.error("could not write game")
if eressea.write_game(file)~=0 then return -1
eressea.log.error("could not write game") end
return -1 return 0
end
return 0
end end
function run_turn(rules) function run_turn(rules)
local turn = get_turn() local turn = get_turn()
if turn<0 then if turn<0 then
turn = read_turn() turn = read_turn()
set_turn(turn) set_turn(turn)
end end
orderfile = orderfile or config.basepath .. '/orders.' .. turn orderfile = orderfile or config.basepath .. '/orders.' .. turn
eressea.log.debug("executing turn " .. get_turn() .. " with " .. orderfile .. " with rules=" .. config.rules) eressea.log.debug("executing turn " .. get_turn() .. " with " .. orderfile .. " with rules=" .. config.rules)
local result = process(rules, orderfile) local result = process(rules, orderfile)
if result==0 then if result==0 then
dbupdate() dbupdate()
end end
return result return result
end end
function file_exists(name) function file_exists(name)
local f=io.open(name,"r") local f=io.open(name,"r")
if f~=nil then io.close(f) return true else return false end if not f then
return false
end
io.close(f)
return true
end end
if file_exists('execute.lock') then if file_exists('execute.lock') then