diff --git a/scripts/tests/e2/e2features.lua b/scripts/tests/e2/e2features.lua index 0b50e1a53..3034c7ed1 100644 --- a/scripts/tests/e2/e2features.lua +++ b/scripts/tests/e2/e2features.lua @@ -607,7 +607,7 @@ function test_seacast() u2.ship = s1 u2:add_spell("stormwinds") u2:clear_orders() - u2:add_order("Zaubere stufe 2 'Sturmelementar' " .. itoa36(s1.id)) + u2:add_order("ZAUBERE STUFE 2 'Sturmelementar' " .. itoa36(s1.id)) u1:clear_orders() u1:add_order("NACH O O O O") process_orders() diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua index e39bd26c4..0b2fccd90 100644 --- a/scripts/tests/e3/rules.lua +++ b/scripts/tests/e3/rules.lua @@ -6,7 +6,6 @@ else module(tcname, lunit.testcase, package.seeall) end -local settings -- use the C implementation in market.c, because the Lua -- module is wrong (https://bugs.eressea.de/view.php?id=2225) @@ -16,28 +15,14 @@ local function process_markets() eressea.process.markets() end -local function set_rule(key, value) - if value==nil then - eressea.settings.set(key, settings[key]) - else - settings[key] = settings[key] or eressea.settings.get(key) - eressea.settings.set(key, value) - end -end - function setup() eressea.game.reset() settings = {} - set_rule("rules.move.owner_leave", "1") - set_rule("rules.food.flags", "4") - set_rule("rules.ship.drifting", "0") - set_rule("rules.ship.storms", "0") -end - -function teardown() - for k,_ in pairs(settings) do - set_rule(k) - end + eressea.settings.set("rules.move.owner_leave", "1") + eressea.settings.set("rules.food.flags", "4") + eressea.settings.set("rules.ship.drifting", "0") + eressea.settings.set("rules.ship.storms", "0") + eressea.settings.set("magic.resist.enable", "0") end function test_new_faction_cannot_give_unit() @@ -988,7 +973,7 @@ function test_no_uruk() end function test_bug2187() - set_rule("rules.food.flags", "0") + eressea.settings.set("rules.food.flags", "0") local r = region.create(0,0,"plain") local f = faction.create("goblin", "2187@eressea.de", "de") @@ -1005,7 +990,7 @@ function test_bug2187() -- init_reports() -- write_report(f) - set_rule("rules.food.flags", "4") + eressea.settings.set("rules.food.flags", "4") end @@ -1027,8 +1012,8 @@ end function test_demons_using_mallornlance() -- bug 2392 - set_rule("skillchange.demon.up", "0") - set_rule("NewbieImmunity", "0") + eressea.settings.set("skillchange.demon.up", "0") + eressea.settings.set("NewbieImmunity", "0") local r = region.create(0, 0, "plain") local f = faction.create('goblin') local u = unit.create(f, r, 1, 'demon') diff --git a/scripts/tests/spells.lua b/scripts/tests/spells.lua index b0def9560..d72851017 100644 --- a/scripts/tests/spells.lua +++ b/scripts/tests/spells.lua @@ -15,6 +15,7 @@ function setup() eressea.settings.set("rules.encounters", "0") eressea.settings.set("magic.fumble.enable", "0") eressea.settings.set("magic.regeneration.enable", "0") + eressea.settings.set("magic.resist.enable", "0") end function test_create_bogus()