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

335 commits

Author SHA1 Message Date
Enno Rehling
654ee9e6bf minimal script to load configuration in an interactive session 2015-03-07 14:33:38 +01:00
Enno Rehling
677f0903cb fix broken tests (they were fixed in master, but not in develop?) 2015-03-07 14:11:32 +01:00
Enno Rehling
cad154ac59 re-enable silver weight 
Conflicts:
	scripts/tests/e3/rules.lua
	scripts/tests/faction.lua
 2015-03-07 13:58:44 +01:00
Enno Rehling
491f6f2cb3 re-enable silver weight 2015-03-07 13:56:31 +01:00
Enno Rehling
02e43d2772 fix a crash in the ancient wedding code? 2015-03-06 22:38:27 +01:00
Enno Rehling
b68e2a983e added tests to make sure volcanooutbreak and spyreport are no longer empty messages. 2015-02-22 22:31:50 +01:00
Enno Rehling
ffbfdee4ff whitespace changes 2015-02-20 20:35:02 +01:00
Enno Rehling
45b77c9993 Merge branch 'repairing_lua_tests' of https://github.com/CTD1/eressea-server-bugfixing into CTD1-repairing_lua_tests 
Conflicts:
	scripts/run-tests.lua
 2015-02-20 20:28:36 +01:00
Enno Rehling
cbb88d0d11 Merge pull request #150 from badgerman/bug-2077-ents 
Bug 2077: ents were created as undead
 2015-02-19 19:32:59 +01:00
Enno Rehling
4eed731b8f repair bad ents, do not create them as undead. 2015-02-19 17:30:13 +01:00
Enno Rehling
426aeee076 Make tests return the number of errors as exit code. 2015-02-16 16:59:07 +01:00
CTD
8f21aa7a11 repairing lua tests 
Das ist totales Chaos, viele Testcases wurden einfach nicht ausgeführt
weil sie nicht in den init files stehen.
Etwas neu strukturiert, Test laufen jetzt auch wenn sie nicht aus dem
eressea root Ordner gestartet werden wie in s/runtest und es sind einige
Testcases mehr als bisher. Auch macht Travis jetzt die E3 Test. Dabei
ist ein schwerwiegender Fehler beim neuen Bewache aufgefallen!
 2015-02-13 16:03:05 +01:00
Enno Rehling
c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 2015-01-29 18:03:21 +01:00
Enno Rehling
7527e6e903 disable silver weight for the initial rollout of version 3.4 
two weeks after launch, revert this commit
 2015-01-29 16:56:21 +01:00
Enno Rehling
6fb23af66a test that ships are encumbered by money. define money in XML, not just in code. 2015-01-14 17:56:12 +01:00
Enno Rehling
468882f974 test that money has weight, add weight in init_resources (TODO: use the config files). 2015-01-14 07:46:42 +01:00
CTD
ac3195851a Erstmal nur der Burgenbonus 
Das mit der Größe kommt noch mal extra, der Übersicht wegen.
Sinvoller weise kann man den Bonus jetzt in der castle.xml einstellen.
Mit neuen Defaultwerten in den XML Dateien.
 2015-01-09 15:53:14 +01:00
Enno Rehling
d3524b9eab do not write reports from tests 2015-01-04 16:43:47 +01:00
Enno Rehling
3db403d7fd functional test for GROW/BREED horses (Bug 1886) 2015-01-04 15:42:36 +01:00
Enno Rehling
0aa002a6d2 Functional test for bug 1882: Verify that COMBAT/FIGHT/KÄMPFE have the desired effect. 2015-01-04 13:20:11 +01:00
Enno Rehling
14b1a164ed when tests are modifying important global state, they should reset it in teardown. 
TODO: actually, they probably should not modify state in the first place.
 2015-01-03 16:11:33 +01:00
Enno Rehling
4ed469c126 do not try setting luxury demand on oceans. 
add some old E3 tests, disable those that have rotted.
 2015-01-01 10:12:03 +01:00
Enno Rehling
9453aff7f5 fix running game-specific tests for E3, add them to the test suite. 2014-12-31 21:07:42 +01:00
Enno Rehling
f524f23cd4 superfluous semicolons and other small stuff. 
missing strings are an error, not a warning.
 2014-12-31 13:17:54 +01:00
Enno Rehling
880b965c54 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-12-28 17:29:34 +01:00
Enno Rehling
df3ce116a7 limit eternath gates to 1-person units, avoid crash 2014-12-27 23:51:48 +01:00
Enno Rehling
9ac90dd6a5 bugfix: USE snowman did not check that the unit actually owned a snowman, causing a unit to have negative snowmen in turn 629 (exploit). 2014-12-13 23:20:10 +01:00
Enno Rehling
e5d53769df lock files to prevent accidents. 
preview will only run if the turn worked out.
cannot accidentally run in the game directory.
 2014-12-11 12:19:31 +01:00
Enno Rehling
20234ca27a lock files to prevent accidents. 
preview will only run if the turn worked out.
cannot accidentally run in the game directory.
 2014-12-11 12:19:04 +01:00
Enno Rehling
9c6b7af27f fix a bug in the eternath quest gates (re-running old turn sometimes needs this). 2014-12-11 09:15:19 +01:00
Enno Rehling
6438d6807e accepting Don's changes to the setup script. 
back-filling test for faction.get and get_faction.
 2014-11-26 18:37:07 +01:00
Enno Rehling
7b2d1991d8 add missing file, fix factions that lack a locale. 2014-11-23 21:15:09 +01:00
Enno Rehling
f92df416ff monsters need a default locale, or their report will crash (thanks, Don!) 
- empty factions have not seen any region, prevent the code from crashing in that case.
- must load the rules even when only writing the reports (taxation affects guards?)
 2014-11-23 15:50:22 +01:00
Enno Rehling
49493fa630 fix typo in last commit. 
package is a standard lua module, not a good variable name.
log name of script.
 2014-11-06 07:53:15 +01:00
Enno Rehling
143fab9653 Some changes after talking to Don. 
moved locale change into its own module.
made monsters get a report by default.
reoved old creation.c code, it was dead.
 2014-11-06 07:15:53 +01:00
Enno Rehling
93e20ac7a9 clean up data files after tests are finished. 2014-11-04 08:06:46 +01:00
Enno Rehling
b2140f54fd refactor, move give_cmd into give.c 2014-11-03 08:44:26 +01:00
Enno Rehling
6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling
f9c5d58f41 read json config file if available. 
missed an include, broke the build.
 2014-10-29 08:30:07 +01:00
Enno Rehling
cd470d5e27 fix string concatenation operator 2014-10-16 14:33:20 +02:00
Enno Rehling
7987b82c62 remove obsolete scripts and module definitions. 
a lot of these were from before the module rewrite, and duplicates of the new code.
 2014-10-14 18:55:44 +02:00
Enno Rehling
61a1b6fafd useful scripts for setting up the game. 
fix silver->money in the build scripts.
config.lua: load the game configuration
reports.lua: write the reports for the (initial) turn
 2014-10-10 20:19:04 +02:00
Enno Rehling
206e0a2fc5 Accidentally deleted initial path logic. 
This code is important for bootstrapping the LUA_PATH
 2014-08-12 23:15:35 +02:00
Enno Rehling
f0ac736bd1 map script needs to set up the script folder. 2014-08-12 23:06:44 +02:00
Enno Rehling
91ec503b43 fix the mapper script. 
1. move xml configuration reading to a separate module, it's compliated.
2. move the map file to the main scripts folder.
 2014-08-12 22:54:55 +02:00
Enno Rehling
3c2ae7ca93 preview script and logging cleanup 
1. all log messages will be terminated with \n, whether the user provided
	it or not.
2. remove a bunch of print() calls from scripts to reduce clutter
3. replace printf calls with log_* calls to reduce clutter
4. add the new release preview script
 2014-08-11 12:04:12 +02:00
Enno Rehling
130f6401b7 No christmas trees in E4 
- Bugfix for http://bugs.eressea.de/view.php?id=2019
- removing some old tests
 2014-08-10 23:07:25 +02:00
Enno Rehling
91eead0993 fix test runner 2014-08-07 13:23:11 +02:00
Enno Rehling
d2bee4e185 new test script, rule-independent tests. 2014-08-07 13:19:19 +02:00
Enno Rehling
7348ce698b add config.path parsing to a module of its own. 2014-08-06 23:47:16 +02:00
Enno Rehling
71056cc2e5 in Lua 5.2, table.getn no longer exists 2014-08-03 20:51:22 +02:00
Enno Rehling
afd41286b5 config file reading based on game name and install location. 2014-08-03 20:37:05 +02:00
Enno Rehling
ebe078df61 replace backslash with forward for unix-style paths 2014-08-03 12:43:16 +02:00
Enno Rehling
9cb0deb4f9 Eressea tests, rewritten 2014-08-02 23:17:55 +02:00
Enno Rehling
44c89e26ec Lua module rewrite, part deux. 
rules for E3 and E4
some missing files.
 2014-07-26 23:41:56 +02:00
Enno Rehling
d994caf7a3 Merge branch 'master' of https://github.com/eressea/server 2014-07-26 22:52:31 +02:00
Enno Rehling
d9457a2488 rewrite of the Lua module system. 
At this time, only E2 is working.
Fixing a lot of old code (monster is no longer id 0).
package.paths configured from eressea.ini
install directory configured from eressea.ini
moving building_action into a seaprate module (it's deprecated)
 2014-07-26 22:52:25 +02:00
Enno Rehling
67cf73d42c update ini files so tests will pass again 2014-07-23 16:01:56 +02:00
Enno Rehling
30e9565ae6 update config files to use game.rules from eressea.ini. 
ToDo: set rules from command line with -r
 2014-07-23 12:19:24 +02:00
Enno Rehling
fbe9822e9c mpve sceipts tp the roght place. 2014-07-19 23:55:41 +02:00
CTD1
aae6ac34d9 Bug 0002014: Zwergenausrüstung kann nicht hergestellt werden 
Testcase auf Rasse Halbling geändert.
 2014-07-15 15:37:09 +02:00
Enno Rehling
b2b35fd9d0 add a test for the E3 reduced give quota. 
foreign units receive only 50% of silver given to them.

Conflicts:
	tests/pool.lua
 2014-07-07 03:41:33 +02:00
Enno Rehling
88f9d247bd Revert "use race::flags|RCF_NOGIVE instead of race::ec_flags|GIVEITEM" 
E3 Tests (GIVE) did not pass.

This reverts commit 5ec3f5b83a.
 2014-07-06 00:29:52 -07:00
TomBraun
9930324619 Change test for bug 0001976 
Conflicts:
	scripts/tests/eressea.lua
 2014-07-04 22:44:28 -07:00
Enno Rehling
5011d3f6ff some touching up to the new test here 2014-07-04 22:42:13 -07:00
TomBraun
783df84055 BUG owner of a building can't enter ship 
If owner of a building want to enter a ship or other building,
he must first leave the bulding.
Commands are "leave" and "enter <ship/tower> <ID>".
For buildings was that OK but not for ships.
The building owner was inside the region after that commans
and not in the ship.
 2014-07-04 22:31:09 -07:00
Enno Rehling
8fc137d780 Expose the "working" flag for buildings to Lua. 
Test working vs. unpaid harbour landigns with a ship.
 2014-07-04 22:12:12 -07:00
Enno Rehling
7a6b237de0 Merge branch 'master' of github.com:TomBraun/server into TomBraun-master 
Conflicts:
	src/kernel/build.c
	src/kernel/item.c
 2014-06-29 20:05:44 -07:00
TomBraun
50ff812bb8 Add test Iron Golems now use the corect number of iron. 
Test also Iron Golems can now create dwarfen only items
(makes irongolems usable for dwarfs)
 2014-06-25 13:26:34 +02:00
TomBraun
fa9ac186d7 Test a bug that crasehed the server 
when Stonegolems created a new building and
the whole unite was consumed during this process
(could not enter the new building as no one was left in the unit)
 2014-06-25 13:20:00 +02:00
Enno Rehling
7adb8498aa Merge branch 'fix_block_movement' of github.com:stm2/server into stm2-fix_block_movement 
Conflicts:
	scripts/tests/eressea.lua
	src/kernel/move.c
 2014-06-23 20:34:07 -07:00
Enno Rehling
24dc006e43 fix json config for terrains, some other stuff. 2014-06-13 17:36:05 -07:00
Enno Rehling
2033aabf60 new test suite, moving to new directory. 2014-06-13 17:35:43 -07:00
Enno Rehling
6e56c56d39 read ships from config file (only very basic) and create them in a lua test. 2014-06-13 08:28:33 -07:00
Enno Rehling
d503937999 working on making json config understand ships and buildings. 
new tests in progress.
remove giveitem.c attribute, the name clashed with a trigger,
and it was only part of an arena that is gone from the game, I think.
 2014-06-12 22:14:07 -07:00
Enno Rehling
30c1b0e1ff new lua test framework, work in progress. 2014-06-12 17:41:03 -07:00
Steffen Mecke
dc3eea0c70 take best unit and count amulet at most once for guards blocking movement 2014-06-04 11:04:17 +02:00
Enno Rehling
fa256360b9 eliminate kill_nonstarters 2014-06-03 06:29:33 +02:00
Enno Rehling
77a3dc91d5 disable test, because bug 1738 is still not fixed 2014-06-02 05:49:34 +02:00
Enno Rehling
2587c069b4 quick mapping tool 2014-05-10 19:00:50 +02:00
Enno Rehling
75b7ac3064 new turn processing script, 
add adamantium to config
 2014-04-27 02:59:02 +02:00
Enno Rehling
94e8a65d4f processing scripts and tools 2014-04-25 08:41:52 +02:00
Enno Rehling
35c2baafbe do not read turn file for turn 0 2014-04-25 07:47:23 +02:00
Enno Rehling
443583a6d6 fix intermittent test for e3 building owners 2014-03-17 08:52:33 +01:00
Enno Rehling
6e3ed568ea fix lua test for blessed harvest. 2014-03-17 08:21:35 +01:00
Thomas Troeger
d2267db53a - minor spelling fix. 2014-03-16 23:18:00 +01:00
Thomas Troeger
33b68ecc19 - moved test for bug 1738 to better location. 2014-03-16 23:17:48 +01:00
Enno Rehling
e350b8a146 rebuild lua bindings 
fix json export
add a script to reset submodules
 2014-03-16 02:12:49 -07:00
Enno Rehling
e8b28725e1 do not run tolua inside MSVC 
The cmake rules for this do not work.
 2014-03-08 04:28:04 -08:00
Enno Rehling
a774f882e5 fix a test that compared structs 2014-01-07 06:47:20 +01:00
Enno Rehling
7b86db29d7 Fixing some last holdouts from the eressea->core rename. 2013-12-30 09:29:18 +01:00
Enno Rehling
ca79c28eaf kill empty folder 2013-12-27 01:07:55 +01:00
Enno Rehling
64046250d4 confusion, merge latest changes 2013-02-23 17:27:50 -08:00
Enno Rehling
eff21f8b51 write_game lives in the eressea module now 2013-01-28 17:52:44 -08:00
Enno Rehling
e378397fb4 searching for bug where owners leave castle 2012-08-03 00:52:24 -07:00
Enno Rehling
d5443f88d8 laen test does not work. trying to make setresource add the raw material to fix it 2012-08-02 00:06:22 -07:00
Enno Rehling
ba328d913e math.mod is deprecated 2012-07-10 09:22:51 +02:00
Enno Rehling
64658bd260 fixing intermittent test 2012-07-09 08:28:08 +02:00
Enno Rehling
f33226947d test was intermittent for mallorn forests 2012-07-09 07:31:34 +02:00
Enno Rehling
9abac59f4b fix soem tests that were intermittent 
use latest eressea module
 2012-07-09 04:18:08 +02:00
Enno Rehling
f7edcf589a update to latest version of the eressea module 
fixes for bool type
fixes for lua 5.2
fixes for some intermittent tests
 2012-07-09 02:51:48 +02:00
Enno Rehling
619e84d0f7 make all tests use the new lua API 2012-06-17 02:59:56 +02:00
Enno Rehling
3f2e46c008 use new eressea module functions 2012-06-17 02:54:05 +02:00
Enno Rehling
ecc03a7f2c make e3 server work with new bindings library 2012-06-10 22:33:05 +02:00
Enno Rehling
bff66773cf update the arda server to use submodules and new cmake layout 2012-06-07 12:44:25 -07:00
Enno Rehling
10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling
2f0790800d fix lua tests for arda that were using wrong directories 2012-06-02 10:55:20 -07:00
Enno Rehling
a65a176ba0 rename the example world. It is now called "Arda" (another Tolkien name) 2012-06-01 17:40:25 -07:00
Enno Rehling
77be59a223 repair lua spells (bad stack index) 
add a whole bunch more spell tests
allow spell tests to disable fumbles
 2012-05-29 18:45:50 -07:00
Enno Rehling
4160e01787 fix this test until we support this feature again (should just fix the feature, but I need to run) 2012-05-26 10:45:15 -07:00
Enno Rehling
8ca04a02aa fix region owner when a building transfers 2012-05-26 10:43:37 -07:00
Enno Rehling
749d71f86d testing spells in the example server also 
WIP: create_roi is broken until mages have spellbooks
 2012-05-25 19:55:47 -07:00
Enno Rehling
2bbcfa7e0c test this spell 2012-05-25 19:55:03 -07:00
Enno Rehling
97919c6a25 remove debug output 2012-05-19 18:49:52 -07:00
Enno Rehling
635ee6a99e trying to figure out why some run_tests tests are not working 2012-05-20 03:21:19 +02:00
Enno Rehling
05aba860f0 http://bugs.eressea.de/view.php?id=1855 
fixing delayed-action potions.
 2011-06-04 11:20:04 -07:00
Enno Rehling
191bd4e1b7 we never checked if building maintenance was paid (see also #1740) 2011-03-09 21:00:29 +01:00
Enno Rehling
929ee605e1 insects trying to land in glaciers should not damage ships (cf. #1729) 2011-03-09 21:00:26 +01:00
Enno Rehling
c08fba8308 fix the morale test, needs to update_owners() first. 2011-03-08 21:21:11 -08:00
Enno Rehling
763d134b9f Make all tests for Eressea pass again, using the config module. 2011-03-06 21:49:01 -08:00
Enno Rehling
a1af328950 added Atlantis ship types 2011-03-06 12:43:18 +01:00
Enno
8e650ce4e9 an equals operator on these would be neat 2011-03-05 04:49:08 +01:00
Enno Rehling
02921d0148 removed all unused items 2011-03-04 20:44:30 +01:00
Enno Rehling
cf9bf54a95 spells.lua is a bad file for example and meropis, it tests things that not every game has. 
lua_pushinteger() must be new, I've never used it before.
all tests in meropis and example pass.
 2011-02-26 23:21:12 -08:00
Enno
de4a69e2df fix test, cannot compare factions directly (why is that?) 2011-02-25 16:32:11 +01:00
Enno Rehling
e3dbd71137 test alliance memberlist 2011-02-25 07:28:27 -08:00
Enno Rehling
e6ccccf054 * move the bson tests 
* include the spells tests
 2011-02-19 06:17:08 -08:00
Enno Rehling
6a98cbc8e4 Simple tests for persistent attributes and a fix. 2011-02-19 06:13:24 -08:00
Enno Rehling
1dd659ce78 vs 2010 is the new default 2011-02-19 05:13:57 -08:00
Enno Rehling
2073e8f860 http://bugs.eressea.de/view.php?id=1816 
repair snowmen (xmas 2004)
 2010-11-20 18:01:46 -08:00
Enno Rehling
7b08767aa5 * fix tests to no longer depend on certain common functions 
* decouple tests from upkeep
 2010-10-31 23:49:05 -07:00
Enno Rehling
6773747f93 bring script up to date with current syntax. 2010-10-23 01:12:23 -07:00
Enno Rehling
337dfab982 springtime is time to drown 2010-10-16 21:35:59 -07:00
Enno Rehling
561745b356 springtime on ice 2010-10-16 21:11:03 -07:00
Enno Rehling
8000b9bb2b test learning and teaching, eliminate randomness 2010-10-08 23:40:19 -07:00
Enno Rehling
21eef2159b we want to test teaching. 2010-10-05 22:12:17 -07:00
Enno Rehling
cfa66a87c7 functional test of the new packice terrain 2010-09-11 20:46:46 -07:00
Enno Rehling
92f0ba6dcf frost / packice 2010-09-11 19:30:19 -07:00
Enno
02b89b7d50 feature was meant for e3a, not eressea 2010-09-12 04:12:04 +02:00
Enno Rehling
be2d7d203d frost module: during winter, some oceans freeze over 2010-09-11 18:48:08 -07:00
Enno Rehling
201ae39a4d re-enable stealth faction (anon) 2010-08-28 17:54:15 -07:00
Enno Rehling
320bcb2121 http://bugs.eressea.de/view.php?id=1796 
great bows should be allowed for all, not just elves
 2010-08-17 23:34:50 -07:00
Enno Rehling
bac180afb7 No need to add the spell twice. 2010-08-08 23:38:06 -07:00
Enno Rehling
d8414ea262 small fixes to directories and hings 2010-08-08 11:28:47 +02:00
Enno
7aa0e85917 small fixes to directories and hings 2010-08-08 11:28:43 +02:00
Enno Rehling
44804c2074 undo more CRLF screwups. 2010-08-08 01:14:01 -07:00
Enno
0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00
Enno Rehling
f8094f77dc use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-07 22:53:41 -07:00
Enno Rehling
e608d40e7a moving to a new repository layout. 
step 3: the example server that anyone can use
 2010-08-07 22:17:11 -07:00
Enno Rehling
8713daf906 making markets more fun. 2010-04-19 23:44:36 -07:00