Merge branch 'master' of git://github.com/eressea/server

This commit is contained in:
Thomas Troeger 2014-02-16 03:08:03 +01:00
commit c431b5cdac
1 changed files with 13 additions and 0 deletions

View File

@ -938,6 +938,19 @@ function test_coordinates_no_plane()
assert_true(find_in_report(f, r.name .. " %(0,0%), Berg")) assert_true(find_in_report(f, r.name .. " %(0,0%), Berg"))
end end
function test_show_shadowmaster_attacks()
local r = region.create(0, 0, "plain")
local f = faction.create("noreply@eressea.de", "human", "de")
local u = unit.create(f, r, 1)
u.race = "shadowmaster"
u:clear_orders()
u:add_order("ZEIGE Schattenmeister")
process_orders()
init_reports()
write_report(f)
assert_false(find_in_report(f, ", ,"))
end
function test_coordinates_named_plane() function test_coordinates_named_plane()
local p = plane.create(0, -3, -3, 7, 7, "Hell") local p = plane.create(0, -3, -3, 7, 7, "Hell")
local r = region.create(0, 0, "mountain") local r = region.create(0, 0, "mountain")