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

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

This commit is contained in:
Enno Rehling 2017-12-23 17:37:34 +01:00
parent 6bd4e543ba abd2a398d1
commit 1b13f6119b
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/tests/common.lua
View File

@ -1160,3 +1160,19 @@ function test_bug_2393_cart()
process_orders() process_orders()
assert_equal(r1, u.region) assert_equal(r1, u.region)
end end
function test_immunity_stops_guard()
eressea.settings.set("NewbieImmunity", 2)
local f = faction.create('human')
local r = region.create(0, 0, 'plain')
local u = unit.create(f, r)
u:set_skill('polearm', 2)
u:add_item('lance', 1)
u:add_order('BEWACHE')
process_orders()
assert_equal(f.age, 1)
assert_true(not u.guard)
process_orders()
assert_equal(f.age, 2)
assert_true(u.guard)
end

5
scripts/tests/e3/rules.lua
View File

@ -1011,6 +1011,7 @@ end
function test_demons_using_mallornlance() function test_demons_using_mallornlance()
-- bug 2392 -- bug 2392
set_rule("skillchange.demon.up", "0") set_rule("skillchange.demon.up", "0")
set_rule("NewbieImmunity", "0")
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create('goblin') local f = faction.create('goblin')
local u = unit.create(f, r, 1, 'demon') local u = unit.create(f, r, 1, 'demon')
@ -1019,5 +1020,9 @@ function test_demons_using_mallornlance()
u:add_item('mallornlance', 1) u:add_item('mallornlance', 1)
u:add_order('BEWACHE') u:add_order('BEWACHE')
process_orders() process_orders()
if not u.guard then
init_reports()
write_report(f)
end
assert_true(u.guard) assert_true(u.guard)
end end