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

fix bad Lua test for ents, so they actually guard.

Browse source
This commit is contained in:
Enno Rehling 2016-10-29 17:51:01 +02:00
parent 6075396de3
commit 59c8fbc5a5
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/tests/economy.lua
View file

@ -132,10 +132,10 @@ function test_ent_guards_trees()
u:set_skill("mining", 1) u:set_skill("mining", 1)
local guard = unit.create(get_monsters(), r, 1, "ent") local guard = unit.create(get_monsters(), r, 1, "ent")
u:set_skill("forestry", 1) u:set_skill("forestry", 1)
guard:add_order("BEWACHEN")
guard:clear_orders() guard:clear_orders()
u:clear_orders() u:clear_orders()
guard:add_order("BEWACHEN")
u:add_order("MACHE HOLZ") u:add_order("MACHE HOLZ")
process_orders() process_orders()
assert_equal(1, u:get_item("log")) assert_equal(1, u:get_item("log"))

4
src/settings.h
View file

@ -10,10 +10,6 @@
without prior permission by the authors of Eressea. without prior permission by the authors of Eressea.
*/ */
/*
* Contains defines for the "free" game (Eressea) .
* Include this file from settings.h to make eressea work.
*/
#define ENTERTAINFRACTION 20 #define ENTERTAINFRACTION 20
#define TEACHDIFFERENCE 2 #define TEACHDIFFERENCE 2
#define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_RECRUIT 1