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

Merge branch 'master' of /home/eressea/repo/eressea

Browse source
This commit is contained in:
Enno 2010-11-21 04:12:07 +01:00
commit dc17e6345a
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/eressea/xmas2004.lua
View file

@ -1,6 +1,6 @@
function use_snowman(u, amount) function use_snowman(u, amount)
if u.region.terrain == "glacier" then if u.region.terrain == "glacier" then
local man = add_unit(u.faction, u.region) local man = unit.create(u.faction, u.region)
man.race = "snowman" man.race = "snowman"
man.number = amount man.number = amount
u:add_item("snowman", -amount) u:add_item("snowman", -amount)

18
scripts/tests/eressea.lua
View file

@ -182,3 +182,21 @@ function test_no_uruk()
local f1 = faction.create("noreply@eressea.de", "uruk", "de") local f1 = faction.create("noreply@eressea.de", "uruk", "de")
assert_equal(f1.race, "orc") assert_equal(f1.race, "orc")
end end
function test_snowman()
local r = region.create(0, 0, "glacier")
local f = faction.create("noreply@eressea.de", "human", "de")
local u = unit.create(f, r, 1)
u:add_item("snowman", 1)
u:clear_orders()
u:add_order("BENUTZEN 1 Schneemann")
process_orders()
for u2 in r.units do
if u2~=u then
assert_equal(u2.race, "snowman")
u = nil
break
end
end
assert_equal(nil, u)
end