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

4500 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
d4fdddbc27 Iron golems can now create dwarfen only items 
(makes irongolems usable for dwarfs)
 2014-06-25 13:24:06 +02:00
TomBraun
0400bcafad Iron and Stone golems now use the corect number of stones / iron. 
0001946: Eisengolems stellen keine Waren her
http://bugs.eressea.de/view.php?id=1921
 2014-06-25 13:22:42 +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
TomBraun
84fb776d1c Fixed 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:15:37 +02:00
Enno Rehling
a75d91fb6d remove the last of the static item_type variables. 2014-06-24 23:13:18 -07:00
Enno Rehling
31c0e5c2a4 read items from JSON, with no properties yet 2014-06-24 22:54:10 -07:00
Enno Rehling
92f43a7b51 eliminate it_find calls, replace it_find with something backed by rt_find 2014-06-24 22:44:05 -07:00
Enno Rehling
9d24c3c291 testing resource caching 2014-06-24 19:51:06 -07:00
Enno Rehling
dc8a8cdd71 rt_find -> get_resourcetype optimization 2014-06-24 08:19:11 -07:00
Enno Rehling
d581737744 optimization: caching resource types in get_resourcetype. 
eliminate some it_find calls.
eliminate static variables, they make testing hard.
 2014-06-24 07:42:45 -07:00
Enno Rehling
98470ac3c3 Merge branch 'master' of github.com:eressea/server 2014-06-23 20:45:20 -07:00
Enno Rehling
958c04a8dd Merge branch 'stm2-fix_block_movement' 2014-06-23 20:45:12 -07:00
Enno Rehling
a0c1d4a995 Merge branch 'stm2-fix_block_movement' 2014-06-23 20:43:47 -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