Enno Rehling
958c04a8dd
Merge branch 'stm2-fix_block_movement'
2014-06-23 20:45:12 -07: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
77ee0b7af7
remote the item_t enum for good
2014-06-23 19:17:13 -07:00
Enno Rehling
73da14e305
getting rid of the olditemtypes[] array
...
reduce use of statics
reduce use of item_t enum
2014-06-23 07:28:10 -07:00
Enno Rehling
740b646e54
fix keywords
2014-06-22 12:38:11 -07:00
Enno Rehling
1444ee58f2
kill XEBALLOON etc, fix some strings
2014-06-22 10:43:05 -07:00
Enno Rehling
2c831230a0
Added a test for expensive skills.
...
When resetting the game rules, make sure basic resources (money, hp, person) are initialized.
2014-06-22 07:55:14 -07:00
Enno Rehling
43dc69d94a
copy/paste error
2014-06-21 14:44:40 -07:00
Enno Rehling
d9972a9da9
call init_skills when not using JSON config
2014-06-21 14:39:56 -07:00
Enno Rehling
762f1e467b
integration test for STUDY.
2014-06-21 09:17:10 -07:00
Enno Rehling
bfadc4914f
add JSON configuration to skills, and tests
2014-06-21 08:53:14 -07:00
Enno Rehling
46f6628a08
remove obsolete commands (PRAY) and parameters
2014-06-21 07:34:36 -07:00
Enno Rehling
198e95d6e2
slickedit project updat
2014-06-21 07:33:55 -07:00
Enno Rehling
bff25f3c51
move skill_t into a separate file, give it unit tests.
...
name functions the same as we did for keyword/direction earlier.
to do: json configuration and lua test.
2014-06-20 23:59:04 -07:00
Enno Rehling
ceabbebc90
switch remaining flags from unsigned to int.
2014-06-18 20:53:06 -07:00
Enno Rehling
e4fa797590
Merge branch 'master' of github.com:eressea/server
2014-06-18 20:48:56 -07:00
Enno Rehling
46f68493bc
eliminate debug message
2014-06-18 20:48:26 -07:00
Enno Rehling
eb567918e5
forgot to init the bindings for game.pkg
...
next problem to solve: skills
2014-06-17 23:50:13 -07:00
Enno Rehling
3625ba6a95
remove static variables optimizations, they create global state that is bad for testing
2014-06-17 23:10:55 -07:00
Enno Rehling
59b0f0f582
testing coasts, and that ships will only sail into terrains that's allowed.
2014-06-17 22:06:54 -07:00
Enno Rehling
8166519d30
add a list of valid coasts to ship definition in JSON.
...
fix endless loop in error-line counting.
2014-06-17 21:33:42 -07:00
Enno Rehling
6788d552cd
remove parameters for old PRAY command.
...
Add an eressea.game module to Lua bindings.
2014-06-17 18:12:24 -07:00
Enno Rehling
04845526ca
fix missing keywords for GIVE
2014-06-17 18:00:01 -07:00
Enno Rehling
b6b790d7e7
add a config.reset function to clear configuration state before tests.
2014-06-17 08:46:22 -07:00
Enno Rehling
0675c50c7f
keyword lookup macro
2014-06-16 23:05:39 -07:00
Enno Rehling
5c78a3883e
cleaning up terrains, reading race flags from a JSON array
2014-06-16 22:43:40 -07:00
Enno Rehling
33928568cf
finally have all the scaffolding to write a test with ships.
...
configure terrain flags from json.
ships are always allowed to enter SEA regions.
2014-06-16 22:19:19 -07:00
Enno Rehling
b40ddaeaa1
add test for keyword aliases, add keyword to strings for reverse lookup
2014-06-16 20:41:08 -07:00
Enno Rehling
0af5e96e3a
Renaming keyword tokens to English.
2014-06-16 20:16:06 -07:00
Enno Rehling
27374a9329
put keywords into a namespace before giving them english keys (tbd).
2014-06-16 18:45:32 -07:00
Enno Rehling
249a4390c4
read keyword translations from JSON configuration.
2014-06-16 11:30:23 -07:00
Enno Rehling
645a7fcde6
fix keyword translations, they use critbit, not tokens
2014-06-16 10:32:30 -07:00
Enno Rehling
6a20594fd3
renamedtest files in the rest of the makefiles, too. oops.
2014-06-16 08:07:08 -07:00
Enno Rehling
125fd519a8
rename test files.
...
add tests for keyword.c, incomplete.
2014-06-16 08:01:59 -07:00
Enno Rehling
c8dc6be6f2
rename get_keyword, because something else should have that name.
2014-06-16 07:19:22 -07:00
Enno Rehling
64e0c221ec
directions can now be read from json configuration.
...
rename a couple of functions for more consistency across modules.
2014-06-15 22:17:08 -07:00
Enno Rehling
a144417daa
remove reference to former GM command (I killed it last week)
2014-06-15 21:22:22 -07:00
Enno Rehling
acbef7a3a0
fix missing locales initialization
2014-06-15 21:19:47 -07:00
Enno Rehling
a9f0538d8e
keyword_t and direction_t are moving into their own module.
...
direction parser gets new initialization function, for use in jsonconf later.
add unit tests for directions.
2014-06-15 18:34:39 -07:00
Enno Rehling
812cb98dff
begin binding locales (need to init_locales in the right place, still).
...
fix indentation in some places.
add some assertions.
2014-06-14 07:52:32 -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
e27bde06ac
bindings for error logging, phase 1.
...
better error reporting for json parse errors.
2014-06-13 13:02:03 -07:00
Enno Rehling
97c17b1afa
Merge branch 'master' of github.com:eressea/server
2014-06-13 08:29:01 -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
5a82350037
fix broken xmlreader after most recent cahnges to
...
race/ship_type/building_type creation functions.
2014-06-12 22:30:13 -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
Enno Rehling
b84bf7ba56
add json configuration parser to lua bindings.
2014-06-12 17:39:09 -07:00
Enno Rehling
8d2df36430
clean up indentation.
...
fix duplicate header guard names.
2014-06-12 17:38:45 -07:00
