Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
8276 commits 10 branches 0 tags 41 MiB
Commit graph

2887 commits

Author SHA1 Message Date
Enno Rehling
beb498d70c remove leftover code/data for artrewards. 2017-03-16 19:40:51 +01:00
Enno Rehling
ac12cb966d implement fixed wage functions, select by constant value 2017-03-16 16:07:52 +01:00
Enno Rehling
67a566d728 remove CRTAG_LOCLE define and lookups 2017-03-16 08:13:36 +01:00
Enno Rehling
e68510a07e use report locae, not default, for EFFECTS and GRENZE 2017-03-15 21:30:53 +01:00
Enno Rehling
8d8173def3 remove the functions struct from settings (next: remove wage, too) 2017-03-13 09:30:20 +01:00
Enno Rehling
8cfcffc4aa remove data_turn and gamename from global settings. 
make run-turn.sh work without valgrind
 2017-03-13 09:19:37 +01:00
Enno Rehling
ba3f3a17d3 require that main.c declare any ini variables that we might expect. 2017-03-12 21:03:38 +01:00
Enno Rehling
4b88a5abc7 BUG 2301: validate [game] section in eressea.ini 
load_inifile is old stuff, should use config_get instead.
 2017-03-12 19:48:44 +01:00
Enno Rehling
7b4550b9d6 kill faction.nregions, it is calculated but never read. 2017-03-12 14:20:34 +01:00
Enno Rehling
627f5ba2d1 BUG 2313: summary should not reset num_people. 
it did not count spells correctly.
 2017-03-12 14:18:42 +01:00
Enno Rehling
a93dc5459b BUG 2313: spells must not be counted. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:39:25 +01:00
Enno Rehling
d8e5feac61 additional test for bug 2313. 
do not count spells toward num_unit or num_people.
 2017-03-12 13:24:32 +01:00
Enno Rehling
decc38a056 BUG 2313: proper accounting in remove_unit. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:02:55 +01:00
Enno Rehling
720c41c1bf reproduce bug 2313. 
recruiting breaks f->num_units.
 2017-03-12 12:53:10 +01:00
Enno Rehling
39ec03b2af coverity CID 164473 
remove logically dead code.
 2017-03-12 12:02:29 +01:00
Enno Rehling
ae41cafcb4 fix double free in new lighthouse code 2017-03-12 11:19:40 +01:00
Enno Rehling
4c21ff5d63 BUG 2311: enforce all unit limits. 2017-03-11 20:30:17 +01:00
Enno Rehling
21e260907c BUG 2311: unit limits were not enforced by GIVE. 2017-03-11 20:03:49 +01:00
Enno Rehling
d633c2a9fb BUG 2310: counting units and people. 
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
 2017-03-11 19:36:26 +01:00
Enno Rehling
0f2744fcf3 BUG 2285: remove factions' wealthfrom statistics. 2017-03-11 18:10:23 +01:00
Enno Rehling
a31de0da4f BUG 2306: TRANSLATIONS Plural/Singular mixup. 
https://bugs.eressea.de/view.php?id=2306
 2017-03-11 17:22:40 +01:00
Enno Rehling
f7ca4627d1 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2017-03-11 16:55:29 +01:00
Enno Rehling
858074501e additional comments 2017-03-11 16:37:54 +01:00
Enno Rehling
66a0bc83e5 Merge pull request #673 from ennorehling/profile-hashstring 
speed up some code based on profiling
 2017-03-11 16:28:25 +01:00
Enno Rehling
783bba0467 Merge pull request #672 from ennorehling/lighthouse-speedup 
lighthouses speedup
 2017-03-11 16:17:37 +01:00
Enno Rehling
496c57cb3d Merge branch 'develop' into profile-hashstring 2017-03-11 16:14:31 +01:00
Enno Rehling
3f562e7fc9 Merge branch 'develop' into lighthouse-speedup 
Conflicts:
	src/reports.c
	src/reports.test.c
 2017-03-11 16:08:14 +01:00
Enno Rehling
0bfd1feee6 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/kernel/item.c
 2017-03-11 14:49:31 +01:00
Enno Rehling
51ec560f72 Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
	src/kernel/item.c
	src/modules/arena.c
 2017-03-11 14:41:25 +01:00
Enno Rehling
cdf13c9fec stop using test_create_world, use test_setup. 2017-03-11 14:22:21 +01:00
Enno Rehling
41c6793964 matching test_setup and test_cleanup calls. 2017-03-11 12:57:02 +01:00
Enno Rehling
de0a697ddb Merge branch 'master' of https://github.com/ennorehling/eressea.git 2017-03-11 12:25:56 +01:00
Enno Rehling
b3e929891d Merge branch 'master' into develop 2017-03-11 07:22:49 +01:00
Enno Rehling
8b9f0f0894 BUG 2307: report mallorn trees as Mallorn in the CR. 
for legacy compatibility, we cannot call them Mallornbaeume.
 2017-03-10 23:18:09 +01:00
Enno Rehling
fe95ddafa1 reduce "translation not found" warnings in tests. 2017-03-10 21:43:36 +01:00
Enno Rehling
be0b54494e clean up some tests. 
the test locale gets some extra strings.
test_create_world is bad, stop using it. unfinished.
 2017-03-10 21:29:37 +01:00
Enno Rehling
f54165d4f1 BUG 2309: show true faction to allies. 
https://bugs.eressea.de/view.php?id=2309
 2017-03-08 20:30:32 +01:00
Enno Rehling
77abd703bd backfill test that demonstrates bug 2305. 2017-03-08 20:16:01 +01:00
Enno Rehling
4bda1a34e0 made a mistake in this test. 
creport was reporting to wrong faction (that sees the same output, so it didn't fail).
 2017-03-08 18:29:04 +01:00
Enno Rehling
517da2dff1 breaking test for bug 2309 2017-03-08 18:15:31 +01:00
Enno Rehling
29a8342b4e BUG 2305: show the correct Parteitarnung in the CR. 
We didn't have the required tests, so of course I broke it.
 2017-03-07 19:30:52 +01:00
Enno Rehling
ce9e2ce314 fix invalid arguments for give/receive messages. 2017-03-06 22:24:15 +01:00
Enno Rehling
40e0a9a65f merge bugs 2017-03-06 22:21:27 +01:00
Enno Rehling
7022ae05bd Merge branch 'master' into develop 
Conflicts:
	src/kernel/item.c
	src/modules/arena.c
 2017-03-06 22:20:22 +01:00
Enno Rehling
ba8f51b7d4 Merge pull request #667 from ennorehling/hotfix/config-2301 
fix bugs 2301, 2302, 2303
 2017-03-06 21:57:23 +01:00
Enno Rehling
e3a969ce9b add a test to see that frac_make can handle large integers. 2017-03-06 21:43:31 +01:00
Enno Rehling
05bb109a09 BUG 2303: allied units are not traitors. 
had to rewrite the creport code for this, it is probably less efficient now than ever, but at least it works.
 2017-03-06 21:35:48 +01:00
Enno Rehling
4b246863c0 bug 2303: correct the test. 
we cannot reuse the memstream.
need to recreate it for each test.
need to rewrite the code in creport.c, it is crazy.
 2017-03-06 21:01:50 +01:00
Enno Rehling
1c72b0f297 warn about missing game.mailcmd setting 2017-03-06 20:52:06 +01:00
Enno Rehling
f4eda9f59e prefer dice to dice_rand 2017-03-06 06:28:12 +01:00
Enno Rehling
4d07782e7d Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
 2017-03-06 06:27:31 +01:00
Enno Rehling
33b98b59ec when make_frac cannot find a gcd, cheat. 2017-03-05 22:28:08 +01:00
Enno Rehling
e233ed4344 eliminate source of randomness from test 2017-03-05 19:23:47 +01:00
Enno Rehling
5c1fb83c47 Merge branch 'hotfix/names' of https://github.com/ennorehling/eressea.git 2017-03-05 18:57:35 +01:00
Enno Rehling
cdb65dfd36 Turns out: We did not have a singular form of sapling. 2017-03-05 18:57:28 +01:00
Enno Rehling
dbe5980577 CR is missing saplings? 2017-03-05 18:47:49 +01:00
Enno Rehling
f699c32f0e BUG 2298: fix NR display. 
always use correct singular or plural form.
 2017-03-05 18:25:15 +01:00
Enno Rehling
8d7f966391 BUG 2298: fix CR output. 
always use the plural form.
 2017-03-05 18:23:24 +01:00
Enno Rehling
0379a17350 make report_resource return an rtype, not a name. 2017-03-05 17:42:57 +01:00
Enno Rehling
d6ce1d9cfe Add a test for singular resources. 2017-03-05 17:26:00 +01:00
Enno Rehling
52dd11a28f create a failing test for stones in the NR. 2017-03-05 17:18:17 +01:00
Enno Rehling
45862a06d0 Add a good test for the NR. 
TODO: make it fail.
 2017-03-05 16:55:11 +01:00
Enno Rehling
83f170541b short unit-test for resources in the CR. 
now complains because Bauern!=Bauer.
TODO: crtag is shit.
 2017-03-05 15:51:04 +01:00
Enno Rehling
6a87625409 refactor cr_output_resources for easy testing. 
Write a (failing) test that checks first resource is silver.
 2017-03-05 15:26:04 +01:00
Enno Rehling
aa662e65d2 eliminate R_PERSON hack. 2017-03-05 13:58:11 +01:00
Enno Rehling
5675ef6091 clean and extend the enum of resources. 2017-03-05 11:10:59 +01:00
Enno Rehling
caa8159428 eliminate duplicate string definition 2017-03-05 09:52:17 +01:00
Enno Rehling
acfb666539 remove rtype->uget funpointer, and lua callbacks. 
fix a missing lua_pop that trashed the heap.
 2017-03-04 20:59:43 +01:00
Enno Rehling
50bdc71c1b kill lua_canuse_item and itype->canuse 2017-03-04 17:27:13 +01:00
Enno Rehling
d9d542cfee we only call these when target is 0, anyway. 2017-03-03 19:19:33 +01:00
Enno Rehling
d976ee6f67 special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +01:00
Enno Rehling
a265bc9cdb test giving stuff to 0. 2017-03-03 18:03:34 +01:00
Enno Rehling
5b1e786fb2 fix bad strtok call 2017-03-03 10:35:34 +01:00
Enno Rehling
6e8e163099 make item allow/deny XML easier to read, fix code 2017-03-03 09:56:27 +01:00
Enno Rehling
b0baba4405 bug 2290: sawmill bonus was broken. 
not pleased with the test, which is in lua only.
https://bugs.eressea.de/view.php?id=2290
 2017-03-02 19:21:11 +01:00
Enno Rehling
4502141c5b bug 2292: set mailcmd from eressea.ini 
this fixes https://bugs.eressea.de/view.php?id=2292
 2017-03-02 18:28:00 +01:00
Enno Rehling
45854851ae bug 2292: allow packice to be guarded again. 
https://bugs.eressea.de/view.php?id=2292
 2017-03-02 18:08:58 +01:00
Enno Rehling
326f543ece gcc reports unused variable. 
and for once, that points to a bug!
 2017-03-02 13:01:27 +01:00
Enno Rehling
3cb24299fa bug 2292: only land regions can be guarded. 
https://bugs.eressea.de/view.php?id=2292
Also adding tests for every other failure reason.
 2017-03-02 12:39:21 +01:00
Enno Rehling
912a8b5412 bug 2291: json settings must not override eressea.ini. 
https://bugs.eressea.de/view.php?id=2291
 2017-03-01 21:17:37 +01:00
Enno Rehling
7f03417c37 bug 2286: fix missing addresses. 
was using cansee_unit wrong, mixed up traveler (ut) and target (u).
 2017-03-01 21:10:50 +01:00
Enno Rehling
98447668ca fix bad tests, upgrade clibs. 2017-03-01 20:37:49 +01:00
Enno Rehling
83a862d557 add a failing test for bug 2286 2017-03-01 19:54:52 +01:00
Enno Rehling
e0085eac0c write a test for get_addresses before modifying it. 2017-03-01 19:52:23 +01:00
Enno Rehling
295614643a more factionstealth testing. 2017-03-01 19:18:00 +01:00
Enno Rehling
6d9387f6c2 warn about unused variables, back on 2017-03-01 18:16:07 +01:00
Enno Rehling
fc8e6dc6de TARNE PARTEI creport test 2017-03-01 18:11:46 +01:00
Enno Rehling
e2e602e7ba fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00
Enno Rehling
2eb88c472c have I bollocksed up the deny/allow rules? looks like it 2017-02-28 14:22:59 +01:00
Enno Rehling
c276b5a43c generate error, not crash. 
todo: fix items
 2017-02-28 14:22:59 +01:00
Enno Rehling
5a01eae522 make item_use function crash if new and old rules do not agree 
add a 'test' function to E3 that exercises all those items
 2017-02-28 14:22:59 +01:00
Enno Rehling
69e28034b4 Kill unused "magicboost" function. 
I have no idea why this exists.
 2017-02-27 21:00:15 +01:00
Enno Rehling
49d8a03eca remote the item_type.use funpointer. 2017-02-27 20:41:05 +01:00
Enno Rehling
9e239c88f4 testing insect warmth potion 2017-02-27 20:26:48 +01:00
Enno Rehling
462d0118e3 better testing for some items. 2017-02-27 20:16:50 +01:00
Enno Rehling
9d09574d5e enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-02-27 19:35:14 +01:00
Enno Rehling
1b93c14806 Test E2 items in E2 only. 
Remove eye of demon (broken item).
 2017-02-27 18:50:48 +01:00
Enno Rehling
1a0992e37b remove remainders of the arena. 
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
 2017-02-27 18:21:41 +01:00
Enno Rehling
108501e398 tests for more items 2017-02-27 15:14:52 +01:00
Enno Rehling
3d4860c033 remove more of the artrewards 2017-02-27 14:19:25 +01:00