Enno Rehling
2e392b4d7c
eliminate even more static variable caches
2015-11-22 16:14:27 +01:00
Enno Rehling
f7698d92a9
change how migrant quota is configured for a race, eliminate the related rule caching
2015-11-22 15:53:50 +01:00
Enno Rehling
3bd458b5e8
optimization: read configuration once before all battles, not before or during each individual one.
2015-11-22 15:29:43 +01:00
Enno Rehling
2e2bb8b792
E2: cavalry and forest flags missing for plains
...
https://bugs.eressea.de/view.php?id=2153
2015-11-09 16:51:08 +01:00
Enno Rehling
ee02721c21
fix and tests for otherfaction attributes in E2
...
https://bugs.eressea.de/view.php?id=2152
2015-11-09 13:36:52 +01:00
Enno Rehling
84a92124bd
Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters
...
Conflicts:
conf/e3/config.xml
2015-09-19 13:35:53 +02:00
Enno Rehling
1122bb70a4
fix museum terrains
2015-09-13 10:05:52 +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
0ed365e539
remove the game section from XML config
2015-09-12 18:15:36 +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
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
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
bd1b568da2
Präfix Erz
2015-09-12 14:13:45 +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
c731edbfed
remove prefixes.xml from E4, too
2015-09-12 13:38:31 +02:00
Enno Rehling
3003b7fc61
remove prefixes from E3
...
move prefix test to common.lua
2015-09-12 13:37:43 +02:00
Enno Rehling
1b44e73320
remove prefixes.xml from E2
2015-09-12 13:35:59 +02:00
Enno Rehling
f1476c2167
refactoring: split out a module for race prefixes
2015-09-12 12:24:10 +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
7e8fef01af
forgot some flags for volcano terrain, caused integration test to crash. neat.
2015-09-11 22:18:57 +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
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
16467dbafa
define swamp and desert, move terrains to a separate file
2015-09-11 13:02:28 +02:00
Enno Rehling
9df5799efd
define core plain and ocean in JSON for E2.
2015-09-11 12:52:18 +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
1a9dd531c5
use boolean values in E2 config.
...
add a runtests.bat file for windows developers.
make some tests clean up after themselves (os.remove on files they create).
2015-09-11 09:34:38 +02:00
Enno Rehling
7c56505057
move settings from XML to JSON for all games
2015-09-10 23:27:14 +02:00
Enno Rehling
1969c165d3
allow settings in json configuration file
...
move E2 settings from XML to JSON
2015-09-10 23:16:17 +02:00
Enno Rehling
8463faa849
https://bugs.eressea.de/view.php?id=2133
...
add missing seed.population.* configuration
2015-09-10 18:54:49 +02:00
Enno Rehling
552f32ff97
bugfix https://bugs.eressea.de/view.php?id=2133
...
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
2015-09-04 14:39:44 +02:00
Enno Rehling
6d592a4460
drifting ships do not take damage (forum debate), version update
2015-08-31 12:53:24 +02:00
Enno Rehling
681e2f8bce
increase monster-attack chance in E3 to 10%
2015-08-16 16:20:40 +02:00
Enno Rehling
dbabb94632
first new unit gets five WdL
2015-07-28 10:53:48 +02:00
Enno Rehling
d9e7ff69eb
fix xml config xinclude links
2015-07-26 14:20:28 +02:00
Enno Rehling
a31dd95de0
give the first unit a sword, set skills from the equipment-config, not script
...
make the preview link use a soft-link, not calculate the build-directory again.
2015-07-19 20:07:08 +02:00
Enno Rehling
083c848db1
merge with latest hotfix
2015-07-12 04:53:10 +02:00
Enno Rehling
7906d4469d
return to old mechanism of equipping the first unit, and give some basic necessities to special races.
2015-07-05 16:40:49 +02:00
Enno Rehling
4e67c4ac3f
do not remove new players for missing their first turn.
2015-07-05 15:24:46 +02:00
Enno Rehling
ae8c448698
do not remove new players for missing their first turn.
2015-07-05 14:07:59 +02:00
Enno Rehling
aee4fb4570
disable SIEGE in E2. The feature is bad and broken.
...
https://bugs.eressea.de/view.php?id=1896
2015-07-02 12:07:52 +02:00
Enno Rehling
5667b6dc8c
Merge branch 'develop' of github.com:eressea/server into develop
2015-06-21 16:24:46 +02:00
Enno Rehling
5afd58faff
Revert "disable force_leave code, it is too surprising"
...
This reverts commit f27d60e1b2
.
2015-06-19 13:37:15 +02:00
Enno Rehling
f27d60e1b2
disable force_leave code, it is too surprising
2015-06-18 00:01:11 +02:00
Enno Rehling
6e4c7c12d5
disable force_leave code, it is too surprising
2015-06-17 23:58:18 +02:00
Enno Rehling
3e48b9b966
libxml 1.9.x seems to be a bit pickier about how XML catalogs are written.
2015-06-08 16:51:41 +02:00
Enno Rehling
6e9f889e77
Merge branch 'master' of github.com:eressea/server
...
Conflicts:
src/laws.test.c
2015-06-08 08:47:36 +02:00
Enno Rehling
0de5d698de
Fix the 'B' island generation to use the newfactions file, for use by new GMs.
...
configurable island size.
2015-06-02 15:29:21 +02:00