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

Failing acceptance test for bug 2391.

Browse source
This commit is contained in:
Enno Rehling 2017-12-09 10:24:31 +01:00
parent d740380152
commit 6c18604bce
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scripts/tests/e2/spells.lua
View file

@ -9,6 +9,7 @@ function setup()
eressea.settings.set("NewbieImmunity", "0")
eressea.settings.set("rules.food.flags", "4")
eressea.settings.set("rules.peasants.growth.factor", "0")
eressea.settings.set("magic.fumble.enable", "0")
end
function test_shapeshift()
@ -102,3 +103,25 @@ function test_earn_silver()
assert_equal(350, u:get_item("money"))
assert_equal(0, r:get_resource("money"))
end
function test_appeasement()
local u1, u2, r1, r2, uno
r1 = region.create(0, 0, 'plain')
r2 = region.create(1, 0, 'plain')
u2 = unit.create(faction.create('human'), r1, 1)
u2.name = 'Angsthase'
u2.magic = 'gwyrrd'
u2:add_spell('appeasement')
u2:set_skill('magic', 5)
u2:add_order('NACH O')
u2:add_order('KAMPFZAUBER STUFE 1 Friedenslied')
u2.aura = 10
uno = u2.id
u1 = unit.create(faction.create('human'), r1, 1)
u1:set_skill('polearm', 5)
u1:add_order('ATTACKIERE ' .. itoa36(uno))
process_orders()
u2 = get_unit(uno)
assert_not_nil(u2)
assert_equal(r2, u2.region)
end

2
src/bind_unit.c
View file

@ -286,7 +286,7 @@ static int tolua_unit_get_magic(lua_State * L)
static void unit_setmagic(unit * u, const char *type)
{
sc_mage *mage = get_mage_depr(u);
sc_mage *mage = get_mage(u);
int mtype;
for (mtype = 0; mtype != MAXMAGIETYP; ++mtype) {
if (strcmp(magic_school[mtype], type) == 0)