Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,812 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

538 Commits

Author SHA1 Message Date
Enno Rehling 1c509485f7 Merge pull request #682 from ennorehling/develop 
cmake changes, skillmod rewrite
 2017-04-08 22:14:53 +02:00
Enno Rehling 989ff65ca9 BUG 2318: disable ponnuki 2017-04-08 22:08:19 +02:00
Enno Rehling 599b4a8311 BUG 2318: disable ponnuki 2017-04-08 22:07:12 +02:00
Enno Rehling 7c680481de iron golems can build dwarf armor in E3. 2017-04-02 15:43:14 +02:00
Enno Rehling 8bb7cf8878 WIP: this error has a new message. 2017-04-02 15:39:50 +02:00
Enno Rehling e72155a563 WIP: reimplemented production modifiers. 
The system itself seems to work, but some Lua tests are still failing.
 2017-04-02 14:43:53 +02:00
Enno Rehling 37f3c02ceb do not write reports in tests. 2017-03-30 23:18:50 +02:00
Enno Rehling 4115b321b3 add tests for additional (race-related) production rules. 2017-03-30 21:00:35 +02:00
Enno Rehling 5479d94206 develop branch gives different error message for greatbow. 2017-03-30 20:40:03 +02:00
Enno Rehling 8187530794 disable a test that currently is not passing 2017-03-30 19:15:49 +02:00
Enno Rehling d7fa405dbe Merge branch 'test-races' into develop 2017-03-30 19:09:32 +02:00
Enno Rehling 570a25f6dd split production rules by games 2017-03-30 19:08:33 +02:00
Enno Rehling 29c2e0b8f4 additional testing for race-related production rules. 2017-03-29 17:59:39 +02:00
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 7c19746d84 adjust adamantium test to new rule. 2017-03-26 20:33:48 +02:00
Enno Rehling 39a5b55753 bugfix? mine grants +1 to laen production. 
not certain that this is actually a bug.
 2017-03-26 17:40:13 +02:00
Enno Rehling bd40de1142 additional testing for production rules. 2017-03-26 17:38:45 +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 ec375baa03 Zwergenbonus gibt es nur in E2 2017-03-26 12:48:44 +02:00
Enno Rehling afd1cb4039 cherry-pick test for mine and smithy 2017-03-26 12:45:38 +02:00
Enno Rehling b44c5e54bf Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
Enno Rehling 485e8f0ce4 Revert "add failing test for skill bonus from mine, start work" 
This reverts commit ab87b1da85.
 2017-03-23 19:28:56 +01:00
Enno Rehling ab87b1da85 add failing test for skill bonus from mine, start work 2017-03-23 18:51:30 +01:00
Enno Rehling 68e36e9252 test that adamantium requires a mine 2017-03-23 08:29:24 +01:00
Enno Rehling 17145eaf10 make region:set_resource do the right thing 
also for adamantium
 2017-03-22 20:37:09 +01:00
Enno Rehling bdf7411954 backfill a test for smithies 2017-03-18 10:33:52 +01:00
Enno Rehling ae6d9f0e1a Zwergenbonus gibt es nur in E2 2017-03-18 08:00:35 +01: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 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 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 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 a265bc9cdb test giving stuff to 0. 2017-03-03 18:03:34 +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 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 e2e602e7ba fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00
Enno Rehling 17d410345f failing test for bug 2288 2017-02-28 21:50:49 +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 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 db0cbf34c7 test for aurapotion 2017-02-27 14:17:38 +01:00
Enno Rehling 60c2f1e807 test the birthday amulet 2017-02-27 14:01:41 +01:00
Enno Rehling 604b574d0f fix potion-use? need more testing 2017-02-27 11:39:55 +01:00
Enno Rehling 8b69b6d003 test peasantblood effects 2017-02-27 04:00:45 +01:00
Enno Rehling b8ffc20d87 remove item_useonother callbacks (use is fine). 
add a test for foolpotion.
 2017-02-26 19:54:58 +01:00
Enno Rehling 3c60f863a5 remove the special_resources trie. 
memory leak, bad performance.
 2017-02-26 18:17:58 +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 be14394529 load locales and rules separately (xml prep work) 2017-02-19 16:33:24 +01:00
Enno Rehling 1dcb21b08c bug 2281: add a failing test 
https://bugs.eressea.de/view.php?id=2281
 2017-02-14 20:30:24 +01:00
Enno Rehling 623137e872 test guardhouse level limits. 2017-02-14 19:57:31 +01:00
Enno Rehling 3ea12be564 BENUTZE Muschel repariert. 
at_keys hat jetzt auch zu jedem key ein value, und Funktionen zum Update altee Daten.
 2017-02-13 18:48:38 +01:00
Enno Rehling a4bd4320e5 fix bad read_orders call 2017-02-12 06:24:25 +01:00
Enno Rehling b56538e092 remove test for dicts 2017-02-11 22:37:15 +01:00
Enno Rehling 10e78b1455 remove code for dict and lua .objects properties. 
rewrite muschelplateau code to use keys.
 2017-02-11 22:15:21 +01:00
Enno Rehling 2ee0e599b1 initialize game after loading config 2017-02-11 17:38:39 +01:00
Enno Rehling de10a8ad65 reduce side-effects in snowglobe tests. 
should no longer be intermittent.
 2017-02-05 20:48:44 +01:00
Enno Rehling ae83448e4a Deveron is now just E3 with a different name. 
remove a lot of duplication.
add a -c option to specify a path for eressea.ini
 2017-02-02 10:10:21 +01:00
Enno Rehling 404ac546fa BUG 2273: runtests.bat fails when config is auto-loaded. 
run rules tests with the correct configuration, ignore .ini file
setting.
still not enabling auto-load again, use custom.lua instead.
 2017-01-24 10:36:27 +01:00
Enno Rehling 99274e3ab1 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-23 21:35:01 +01:00
Enno Rehling 6d9d920f81 fix issue #477 (intermittent volcano) 2017-01-23 11:45:05 +01:00
Enno Rehling 94fcef2fac the locales module is deprecated. 
let's do this in custom.lua from now on.
 2017-01-22 19:32:03 +01:00
Enno Rehling f09259f2b3 eliminate duplicate password message 2017-01-22 18:51:20 +01:00
Enno Rehling 2c38883362 configure dbname in eressea.ini (or don't use DB if not 2017-01-22 13:09:32 +01:00
Enno Rehling 8d4a83d1b4 make these modules optional 2017-01-22 11:38:01 +01:00
Enno Rehling d29fd96f59 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-22 08:05:19 +01:00
Enno Rehling 31b3f2b2de remove Umlaut from Lua script 2016-12-10 16:22:57 +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 ecbd0ba83c github issue #606 
disable volcano terrain change for snowglobe test
 2016-11-18 13:30:30 +01:00
Enno Rehling 251c7bb559 re-enable snowglobe assert. 2016-11-16 19:43:06 +01:00
Enno Rehling 17365edff7 move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
Enno Rehling 92d027014a Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:36:05 +01:00
Enno Rehling a285bd332c fix lua tests to not expect numeric values for unit.guard 2016-10-31 20:12:19 +01:00
Enno Rehling 182cecf31b fix tests that use leveled resources. 2016-10-30 19:27:00 +01:00
Enno Rehling 59c8fbc5a5 fix bad Lua test for ents, so they actually guard. 2016-10-29 17:51:01 +02:00
Enno Rehling f17b6f2bb5 WIP: additional testing for GUARD. 
BUG: ents cannot guard, do not protect trees.
FIX: issue #589 (bad test for stardust)
 2016-10-28 20:26:34 +02:00
Enno Rehling e0a6618199 WIP: test production guarding. 
ents are not working, because they rely on being part of the monster faction? bad!
 2016-10-28 19:42:47 +02:00
Enno Rehling 5a129f8bd4 Create the snowman with full hitpoints. 
https://bugs.eressea.de/view.php?id=2239
 2016-10-02 11:42:31 +02: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 ac8332c896 re-enable report tests. 
RF_LIGHTHOUSE also flags for lighthouses with size 0.
 2016-09-18 10:24:08 +02:00
Enno Rehling 929db73102 disable integration tests 
combine prepare_ functions
 2016-09-14 17:14:04 +02:00
Enno Rehling 576f183afb separate tests.report module (lua) 
disable all report testing for now
 2016-09-14 17:04:23 +02:00
Enno Rehling 452614307d require at least 2K peasants in starting regions 2016-09-11 21:27:46 +02:00
Enno Rehling 2294de44c2 accidental duplicate close. 2016-09-11 20:14:19 +02:00
Enno Rehling f926d89929 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 20:10:01 +02:00
Enno Rehling fdb5ecc68b always call close() in lua when you're done with a file. 2016-09-11 19:32:54 +02:00
Enno Rehling c21ecba8dd always call close() in lua when you're done with a file. 2016-09-11 19:28:25 +02:00
Enno Rehling 0124bafdc4 delete dead code 2016-09-11 16:44:35 +02:00
Enno Rehling 9c92582b3a Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-09-08 20:37:03 +02:00
Enno Rehling 544af40981 fix seeding new factions 2016-09-08 20:34:25 +02:00