From 6c18604bce49c98ad90f39de62842270155958f6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 9 Dec 2017 10:24:31 +0100 Subject: [PATCH] Failing acceptance test for bug 2391. --- scripts/tests/e2/spells.lua | 23 +++++++++++++++++++++++ src/bind_unit.c | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/scripts/tests/e2/spells.lua b/scripts/tests/e2/spells.lua index fc1e3bc3b..fdc23eb94 100644 --- a/scripts/tests/e2/spells.lua +++ b/scripts/tests/e2/spells.lua @@ -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 diff --git a/src/bind_unit.c b/src/bind_unit.c index 00c2b9e09..879af57ec 100644 --- a/src/bind_unit.c +++ b/src/bind_unit.c @@ -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)