diff --git a/scripts/tests/e2/e2features.lua b/scripts/tests/e2/e2features.lua index 356e496e7..caf020073 100644 --- a/scripts/tests/e2/e2features.lua +++ b/scripts/tests/e2/e2features.lua @@ -9,6 +9,7 @@ end function setup() eressea.free_game() eressea.settings.set("nmr.timeout", "0") + eressea.settings.set("rules.grow.formula", "0") eressea.settings.set("rules.food.flags", "4") eressea.settings.set("rules.ship.storms", "0") eressea.settings.set("rules.encounters", "0") @@ -88,7 +89,6 @@ function test_herbalism() local f = faction.create("human") local u = unit.create(f, r, 1) - eressea.settings.set("rules.grow.formula", 0) -- plants do not grow u:add_item("money", u.number * 100) u:set_skill("herbalism", 5) r:set_resource("seed", 100) diff --git a/src/laws.c b/src/laws.c index 3fdbc1117..7f515e4ae 100644 --- a/src/laws.c +++ b/src/laws.c @@ -871,7 +871,7 @@ void demographics(void) if (plant_rules==1) { /* E3 */ growing_trees_e3(r, current_season, last_weeks_season); } - else { /* E2 */ + else if (plant_rules) { /* E2 */ growing_trees(r, current_season, last_weeks_season, plant_rules); growing_herbs(r, current_season, last_weeks_season); }