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

fix disabling of tree growth.

This commit is contained in:
Enno Rehling 2021-02-12 19:40:07 +01:00
parent 8fbcf3f379
commit 8d286d5e23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tests/e2/e2features.lua
View File

@ -9,6 +9,7 @@ end
function setup() function setup()
eressea.free_game() eressea.free_game()
eressea.settings.set("nmr.timeout", "0") eressea.settings.set("nmr.timeout", "0")
eressea.settings.set("rules.grow.formula", "0")
eressea.settings.set("rules.food.flags", "4") eressea.settings.set("rules.food.flags", "4")
eressea.settings.set("rules.ship.storms", "0") eressea.settings.set("rules.ship.storms", "0")
eressea.settings.set("rules.encounters", "0") eressea.settings.set("rules.encounters", "0")
@ -88,7 +89,6 @@ function test_herbalism()
local f = faction.create("human") local f = faction.create("human")
local u = unit.create(f, r, 1) 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:add_item("money", u.number * 100)
u:set_skill("herbalism", 5) u:set_skill("herbalism", 5)
r:set_resource("seed", 100) r:set_resource("seed", 100)

2
src/laws.c
View File

@ -871,7 +871,7 @@ void demographics(void)
if (plant_rules==1) { /* E3 */ if (plant_rules==1) { /* E3 */
growing_trees_e3(r, current_season, last_weeks_season); 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_trees(r, current_season, last_weeks_season, plant_rules);
growing_herbs(r, current_season, last_weeks_season); growing_herbs(r, current_season, last_weeks_season);
} }