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

This commit is contained in:
Thomas Troeger 2014-02-16 03:25:04 +01:00
commit 2da0d0f783
1 changed files with 4 additions and 4 deletions

View File

@ -52,10 +52,10 @@ function test_elvenhorse_requires_riding_5()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
region.create(1, 0, "plain") region.create(1, 0, "plain")
local goal = region.create(2, 0, "plain") local goal = region.create(2, 0, "plain")
local f = faction.create("noreply@eressea.de", "human", "de") local f = faction.create("noreply@eressea.de", "halfling", "de")
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("elvenhorse", 1) u:add_item("elvenhorse", 1)
u:set_skill("riding", 5) u:set_skill("riding", 6)-- halfling has -1 modifier
u:clear_orders() u:clear_orders()
u:add_order("NACH O O") u:add_order("NACH O O")
process_orders() process_orders()
@ -66,10 +66,10 @@ function test_cannot_ride_elvenhorse_without_enough_skill()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local goal = region.create(1, 0, "plain") local goal = region.create(1, 0, "plain")
region.create(2, 0, "plain") region.create(2, 0, "plain")
local f = faction.create("noreply@eressea.de", "human", "de") local f = faction.create("noreply@eressea.de", "halfling", "de")
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("elvenhorse", 1) u:add_item("elvenhorse", 1)
u:set_skill("riding", 4) u:set_skill("riding", 5) -- halfling has -1 modifier
u:clear_orders() u:clear_orders()
u:add_order("NACH O O") u:add_order("NACH O O")
process_orders() process_orders()