Commit Graph

23 Commits

Author SHA1 Message Date
Enno Rehling f2bb51b3ab Merge branch 'master' into develop
Conflicts:
	res/adamantium.xml
	res/core/resources/laen.xml
	scripts/tests/common.lua
	scripts/tests/e2/adamantium.lua
	scripts/tests/e2/e2features.lua
	scripts/tests/e2/items.lua
	scripts/tests/items.lua
	src/bind_unit.c
	src/economy.test.c
	src/kernel/resources.c
	src/util/attrib.c
2017-03-26 21:01:21 +02:00
Enno Rehling dcf1c7138b make region:set_resource do the right thing
also for adamantium
2017-03-26 14:33:14 +02:00
Enno Rehling 4c67e0603b remove attribs from rtype (it's only in rtype->construction that we use it?)
test to verify that mine bonus for iron works as advertised.
change the oder of arguments for faction.create (race is the only thing not optional).
2017-03-17 22:46:10 +01:00
Enno Rehling d976ee6f67 special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +01:00
Enno Rehling af28da365d test giving silber to peasants. 2017-03-03 18:53:39 +01:00
Enno Rehling 681a4bdaa8 dolphins are animals, but not horses. 2017-03-03 17:27:51 +01:00
Enno Rehling 259d7d9e80 add a test for giving horses to 0.
should add those horses to the region.
remove horses from test that is about 50% silver.
2017-03-03 16:50:43 +01:00
Enno Rehling bd59271b71 Samen-Definition normalisiert (mit XML/Lua).
Tests repariert.
MACHE Samen gibt es in E3 nicht.
2017-02-23 22:30:19 +01:00
Enno Rehling f06d86007c seed normalization (broken) 2017-02-23 22:08:16 +01:00
Enno Rehling b56538e092 remove test for dicts 2017-02-11 22:37:15 +01:00
Enno Rehling 14b4ae5859 set volcano acitvation chance to 0 during test.
should fix issue #606 for good.
also: additional tests for renumbering ships, Xolgrim is wrong.
2016-11-18 22:31:06 +01:00
Enno Rehling 7ef316f773 Merge branch 'develop' into kill-seen-region 2016-09-18 13:42:32 +02:00
Enno Rehling 18fcba3ed6 failing test for a new bug: empty dummy units get stuck in faction.units after recruiting. 2016-09-18 11:14:00 +02:00
Enno Rehling 576f183afb separate tests.report module (lua)
disable all report testing for now
2016-09-14 17:04:23 +02:00
Steffen Mecke aa3397a24f reduced report directory spam 2016-02-28 16:15:47 +01:00
Enno Rehling ae0206652e passwords are write-only, cannot read them in tests 2016-01-12 07:25:57 +01:00
Enno Rehling 55c15c1905 add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
Enno Rehling bd1b568da2 Präfix Erz 2015-09-12 14:13:45 +02:00
Enno Rehling 3003b7fc61 remove prefixes from E3
move prefix test to common.lua
2015-09-12 13:37:43 +02:00
Enno Rehling cf08cdf3fb configuration type-fixes: int to bool where appropriate (possibly incomplete)
rename some rules to make it more obvious that they are flags or other integer values.
2015-09-11 10:04:08 +02:00
Enno Rehling 1a9dd531c5 use boolean values in E2 config.
add a runtests.bat file for windows developers.
make some tests clean up after themselves (os.remove on files they create).
2015-09-11 09:34:38 +02:00
Enno Rehling 89ea0b9946 simplify test setup: as long as all games have nmr.removenewbie set to off by their config, no test should need to disable it. 2015-07-05 14:16:17 +02:00
Enno Rehling 15e9c5962c merge feature/test-cleanup
removing old test files
merging old tests into current system
fixing some internal bugs (i.e. adjust_coordinates)
2015-07-01 21:24:44 +02:00
Renamed from scripts/eressea/tests/common.lua (Browse further)