diff --git a/src/scripts/config-test.lua b/src/scripts/config-test.lua deleted file mode 100644 index 8ca4859e8..000000000 --- a/src/scripts/config-test.lua +++ /dev/null @@ -1 +0,0 @@ -maxnmrs = 1000 diff --git a/src/scripts/e3a/main.lua b/src/scripts/e3a/main.lua index 494e2643b..6c81ff853 100644 --- a/src/scripts/e3a/main.lua +++ b/src/scripts/e3a/main.lua @@ -26,7 +26,7 @@ function process(orders) mon.lastturn = get_turn() end - if nmr_check(maxnmrs or 30)~=0 then + if nmr_check(config.maxnmrs or 30)~=0 then return -1 end diff --git a/src/scripts/e3a/rules.lua b/src/scripts/e3a/rules.lua index 9e581e2eb..e4e826d16 100644 --- a/src/scripts/e3a/rules.lua +++ b/src/scripts/e3a/rules.lua @@ -42,7 +42,7 @@ end -- the "raindance" spell function raindance(r, mage, level, force) - if (create_curse(mage, r, "blessedharvest", force, force*2, 100 * force)) then + if (create_curse(mage, r, "blessedharvest", force, 1+force*2, 100 * force)) then -- slightly crooked way of reporting an action to everyone in the region local msg = message.create("raindance_effect") msg:set_unit("mage", mage) @@ -57,7 +57,7 @@ end -- the "blessed harvest" spell function blessedharvest(r, mage, level, force) - if create_curse(mage, r, "blessedharvest", force, force*2, 50 * force) then + if create_curse(mage, r, "blessedharvest", force, 1+force*2, 50 * force) then -- slightly crooked way of reporting an action to everyone in the region local msg = message.create("harvest_effect") msg:set_unit("mage", mage) diff --git a/src/scripts/eressea/main.lua b/src/scripts/eressea/main.lua index 5a2fc0677..300a58e7e 100644 --- a/src/scripts/eressea/main.lua +++ b/src/scripts/eressea/main.lua @@ -22,7 +22,7 @@ function process(orders) plan_monsters() - if nmr_check(maxnmrs or 80)~=0 then + if nmr_check(config.maxnmrs or 80)~=0 then return -1 end diff --git a/src/scripts/setup.lua b/src/scripts/setup.lua index 1681d36ce..1d1bbe652 100644 --- a/src/scripts/setup.lua +++ b/src/scripts/setup.lua @@ -12,5 +12,4 @@ end read_xml(srcpath .. '/res/' .. config.game .. '.xml') -require "config-test" require "init"