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

fixing intermittent tests

This commit is contained in:
Enno Rehling 2012-07-09 08:27:41 +02:00
parent 3fda0ab144
commit 5abfaad528
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/tests/common.lua
View File

@ -44,6 +44,7 @@ function setup()
eressea.settings.set("nmr.timeout", "0") eressea.settings.set("nmr.timeout", "0")
eressea.settings.set("NewbieImmunity", "0") eressea.settings.set("NewbieImmunity", "0")
eressea.settings.set("rules.economy.food", "4") eressea.settings.set("rules.economy.food", "4")
eressea.settings.set("rules.encounters", "0")
end end
function test_fleeing_units_can_be_transported() function test_fleeing_units_can_be_transported()
@ -885,6 +886,7 @@ function setup()
eressea.free_game() eressea.free_game()
eressea.write_game("free.dat") eressea.write_game("free.dat")
eressea.settings.set("rules.economy.food", "4") -- FOOD_IS_FREE eressea.settings.set("rules.economy.food", "4") -- FOOD_IS_FREE
eressea.settings.set("rules.encounters", "0")
end end
function test_parser() function test_parser()
@ -1132,7 +1134,12 @@ function test_bug_1875_use_help()
assert_equal(0, u:get_item("peasantblood")) assert_equal(0, u:get_item("peasantblood"))
assert_equal(0, r:get_resource("peasant")) assert_equal(0, r:get_resource("peasant"))
assert_equal(0, r:get_resource("peasant"))
assert_equal(0, u2:get_potion("peasantblood")) -- first unit helps this unit assert_equal(0, u2:get_potion("peasantblood")) -- first unit helps this unit
if 98~=u:get_potion("peasantblood") then
print(get_turn(), f, u)
write_reports()
end
assert_equal(98, u:get_potion("peasantblood")) -- unit uses one peasantblood effect assert_equal(98, u:get_potion("peasantblood")) -- unit uses one peasantblood effect
end end

7
src/gamecode/laws.c
View File

@ -4562,8 +4562,11 @@ void init_processor(void)
p += 10; p += 10;
add_proc_order(p, K_GUARD, &guard_on_cmd, 0, "Bewache (an)"); add_proc_order(p, K_GUARD, &guard_on_cmd, 0, "Bewache (an)");
p += 10; if (get_param_int(global.parameters, "rules.encounters", 1)) {
add_proc_global(p, &encounters, "Zufallsbegegnungen"); p += 10;
add_proc_global(p, &encounters, "Zufallsbegegnungen");
}
p += 10; p += 10;
add_proc_unit(p, &monster_kills_peasants, add_proc_unit(p, &monster_kills_peasants,
"Monster fressen und vertreiben Bauern"); "Monster fressen und vertreiben Bauern");