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

Solve same conflicts with eressea/server manuale

This commit is contained in:
TomBraun 2014-07-05 08:55:59 +02:00
parent 1c3e5166e6
commit 21d4d1f59a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/tests/e3a.lua
View File

@ -283,6 +283,7 @@ function test_market()
for i = 0, 5 do
local rn = r:next(i)
end
b.working = true
eressea.process.markets()
u:add_item("money", -u:get_item("money")) -- now we only have herbs
local len = 0
@ -729,6 +730,6 @@ function test_building_owner_can_enter_ship()
u2:add_item("money", u1.number * 100)
u2:clear_orders()
process_orders()
assert_equal(s1.id, u1.ship.id)
assert_not_equal(b1.id, u1.ship.id, "BUG owner of the building can not go into a ship")
assert_equal(s1, u1.ship)
assert_equal(null, u1.building, "owner of the building can not go into a ship")
end

3
scripts/tests/eressea.lua
View File

@ -347,7 +347,7 @@ function test_only_building_owner_can_set_not_paid()
u2.building = mine
u1:clear_orders()
u2:clear_orders()
-- Test that Bezahle nicht is working
-- Test that Bezahle nicht is working
u1:add_order("Bezahle nicht")
process_orders()
assert_equal(500, u1:get_item("money"))
@ -358,4 +358,3 @@ function test_only_building_owner_can_set_not_paid()
process_orders()
assert_equal(0, u1:get_item("money"))
end