Enno Rehling
3eead446d0
reduce cron log spam
2015-09-26 22:42:22 +02:00
Enno Rehling
90bcf30628
fix bad terrain definitions in E2 (string, not number: these values are used for dice throws).
...
clean up the jsonconf.c code for reading these a little bit, report more specific errors.
2015-09-13 09:46:40 +02:00
Enno Rehling
71c4cb53c0
add missing guard.h include everywhere, remove duplicate prototypes from config.h
2015-09-12 23:41:37 +02:00
Enno Rehling
dd9420fc38
move at_guard into guard module as well
2015-09-12 23:38:31 +02:00
Enno Rehling
3055f517dc
move guard implementation into a module (WIP)
2015-09-12 22:53:54 +02:00
Enno Rehling
5f7b9129bc
Merge branch 'master' into develop
...
Conflicts:
tests/runtests.bat
2015-09-12 22:47:33 +02:00
Enno Rehling
a027139057
remove global variable verbosity in favor of static in main.c (use log_* functions everywhere)
2015-09-12 20:58:09 +02:00
Enno Rehling
06a04d0e20
fix logging for sp_igjarjuk, temporarily set log-levels for the game to error|warn|info
...
remove some code that accesses `verbosity` variable (todo: hide it more, fix logging)
2015-09-12 19:48:03 +02:00
Enno Rehling
63c983e197
Merge branch 'develop' of github.com:eressea/server into develop
2015-09-12 19:28:49 +02:00
Enno Rehling
c7a0fb5f28
development build is 3.7
2015-09-12 19:28:28 +02:00
Enno Rehling
44dd66f2fb
Merge branch 'master' into develop
2015-09-12 19:27:56 +02:00
Enno Rehling
28f17b6a08
release version 3.6.3
2015-09-12 19:27:11 +02:00
Enno Rehling
7259a4b45e
remove parse_main from xmlreader, everything superseeded by jsonconf
2015-09-12 18:16:23 +02:00
Enno Rehling
1e75255d51
allow disabling skills through json
2015-09-12 17:43:31 +02:00
Enno Rehling
a01955e06a
disable features by name that are not keywords
2015-09-12 17:37:29 +02:00
Enno Rehling
c76b118fb8
eliminate game/order from XML data
2015-09-12 17:12:02 +02:00
Enno Rehling
44eb3a4f58
disable keywords through JSON configuration
2015-09-12 17:06:55 +02:00
Enno Rehling
32ff7c89bc
Merge pull request #296 from ennorehling/feature/config-producexpchance
...
Bug 2137: calculating produceexp correctly
2015-09-12 16:52:55 +02:00
Enno Rehling
7906cdbcb6
do not read gamename from XML, read it from JSON only (two mechanisms for the same feature are too many)
2015-09-12 16:49:18 +02:00
Enno Rehling
d65e9aaf94
eliminate xml reading of produceexp chance
2015-09-12 16:42:02 +02:00
Enno Rehling
8a95ea0c00
speeding up produceexp_chance
2015-09-12 16:41:22 +02:00
Enno Rehling
9bdc811582
produceexp uses a json-configurable constant
...
make get_param_flt return a double, floats are for wimps.
2015-09-12 16:38:51 +02:00
Enno Rehling
68c448b3fb
fix signature of callback
2015-09-12 16:29:57 +02:00
Enno Rehling
d1686849e0
refactoring: move produceexp into unit module, for want of a better one. add a bit of test coverage.
...
https://bugs.eressea.de/view.php?id=2137 - fix learning-by-doing with less than u->number people.
2015-09-12 16:25:47 +02:00
Enno Rehling
c704cd5784
release version 3.6.2
2015-09-12 15:41:25 +02:00
Enno Rehling
9563aa712f
eliminate junk function
2015-09-12 14:16:18 +02:00
Enno Rehling
42f1030251
separate test script for E4:
...
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
2015-09-12 14:10:08 +02:00
Enno Rehling
aa32cf190e
remove xmlreader code for prefixes
2015-09-12 13:40:10 +02:00
Enno Rehling
09efd9c2a9
fix anything that uses the calendar module. opps.
2015-09-12 12:54:49 +02:00
Enno Rehling
13e1573611
moving the calendar module out of the kernel directory, it does not belong with the major game objects
2015-09-12 12:54:09 +02:00
Enno Rehling
47c95aee35
implement JSON prefixes. fix free_prefixes not resetting size (TODO: quicklist).
2015-09-12 12:49:12 +02:00
Enno Rehling
f0e255924f
add a unit test for add/free prefixes. fix bad free_prefixes call site.
2015-09-12 12:41:04 +02:00
Enno Rehling
9f6b374056
add a (red) test for JSON prefixes.
2015-09-12 12:33:25 +02:00
Enno Rehling
44d982d210
free race prefixes when the game is done (small memory leak).
2015-09-12 12:29:42 +02:00
Enno Rehling
f1476c2167
refactoring: split out a module for race prefixes
2015-09-12 12:24:10 +02:00
Enno Rehling
bd51ac7dd7
eliminate terrain parsing from xmlreader.c, it's all in JSON now!
2015-09-11 22:46:47 +02:00
Enno Rehling
c57918ede0
replace XML terrains for E3 and E4 with JSON configuration
2015-09-11 22:43:08 +02:00
Enno Rehling
b4971dd651
replace all of the E2 terrains with JSON data (no more XML!)
2015-09-11 22:11:59 +02:00
Enno Rehling
7c4d18ec2d
avoid an annoying division by zero when terrains are not fully initialized (size=0)
2015-09-11 21:31:59 +02:00
Enno Rehling
db4cb2618b
transfer most core and all game-specific terrains for E2 from XML to JSON.
2015-09-11 21:14:10 +02:00
Enno Rehling
9df5799efd
define core plain and ocean in JSON for E2.
2015-09-11 12:52:18 +02:00
Enno Rehling
a582c69523
finished and tested: terrains can be completely defined in JSON.
2015-09-11 12:27:45 +02:00
Enno Rehling
43bac506a4
fix bad size for calloc.
2015-09-11 12:25:28 +02:00
Enno Rehling
c707ff39b6
memory leak: properly free terrain_production objects
2015-09-11 12:17:35 +02:00
Enno Rehling
59e2c12605
completing the implementation of JSON terrains (WIP).
...
seeing a crash when trying to allocate a resource for stone in test_json_terrains.
2015-09-11 12:12:53 +02:00
Enno Rehling
8860244f1c
Merge branch 'link-seen-duplicate' into feature/feature-json-terrains
2015-09-11 11:12:30 +02:00
Enno Rehling
d15d0cc0f4
remove unused xml_i function
2015-09-11 11:08:10 +02:00
Enno Rehling
cf08cdf3fb
configuration type-fixes: int to bool where appropriate (possibly incomplete)
...
rename some rules to make it more obvious that they are flags or other integer values.
2015-09-11 10:04:08 +02:00
Enno Rehling
c5e14c85a6
read boolean json values
...
be smarter about reading number values that are integers
2015-09-11 09:17:07 +02:00
Enno Rehling
9bb2a625f9
fix xmlreader bug introduced by last commit (xpath->node not initialized)
2015-09-11 09:10:00 +02:00
