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

Merge branch 'master' into release-3-5 

Conflicts:
	src/laws.test.c
This commit is contained in:
Enno Rehling 2015-06-08 08:50:18 +02:00
parent 5cf02e35e1 6e9f889e77
commit 29753985f7
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ game-e3/reports/
*.log.* *.log.*
tags tags
Thumbs.db Thumbs.db
.gdb_history

1
conf/eressea.ini
View File

@ -12,7 +12,6 @@ locales = de,en
install = . install = .
paths = lunit:scripts paths = lunit:scripts
maxnmrs = 20 maxnmrs = 20
rules = e2
[editor] [editor]
color = 1 color = 1

4
scripts/eressea/xmlconf.lua
View File

@ -5,6 +5,6 @@ end
rules='' rules=''
if config.rules then if config.rules then
rules = config.rules .. '/' rules = config.rules .. '/'
read_xml(confdir .. rules .. 'config.xml', confdir .. rules .. 'catalog.xml')
eressea.config.read(rules .. 'config.json', confdir)
end end
read_xml(confdir .. rules .. 'config.xml', confdir .. rules .. 'catalog.xml')
eressea.config.read(rules .. 'config.json', confdir)

18
src/laws.test.c
View File

@ -696,12 +696,11 @@ static void test_reserve_self(CuTest *tc) {
static void statistic_test(CuTest *tc, int peasants, int luck, int maxp, static void statistic_test(CuTest *tc, int peasants, int luck, int maxp,
double variance, int min_value, int max_value) { double variance, int min_value, int max_value) {
int effect, i; int effect;
for (i = 0; i < 1000; ++i) {
effect = peasant_luck_effect(peasants, luck, maxp, variance); effect = peasant_luck_effect(peasants, luck, maxp, variance);
CuAssertTrue(tc, min_value <= effect); CuAssertTrue(tc, min_value <= effect);
CuAssertTrue(tc, max_value >= effect); CuAssertTrue(tc, max_value >= effect);
}
} }
static void test_peasant_luck_effect(CuTest *tc) { static void test_peasant_luck_effect(CuTest *tc) {
@ -713,6 +712,13 @@ static void test_peasant_luck_effect(CuTest *tc) {
statistic_test(tc, 100, 0, 1000, 0, 0, 0); statistic_test(tc, 100, 0, 1000, 0, 0, 0);
statistic_test(tc, 100, 2, 1000, 0, 1, 1); statistic_test(tc, 100, 2, 1000, 0, 1, 1);
<<<<<<< HEAD
=======
/*
statistic_test(tc, 1000, 400, 1000, 0, (int)(400 * 10 * 0.001 * .75),
(int)(400 * 10 * 0.001 * .75));
*/
>>>>>>> master
statistic_test(tc, 1000, 400, 1000, 0, 3, 3); statistic_test(tc, 1000, 400, 1000, 0, 3, 3);
statistic_test(tc, 1000, 1000, 2000, .5, 1, 501); statistic_test(tc, 1000, 1000, 2000, .5, 1, 501);