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
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
Enno Rehling
4b721e074d
diable test_peasantluck, it fails on master
...
do not load any config for run-tests.lua
2015-05-24 10:31:11 +02:00
Enno Rehling
e9992db51c
fix pool test (GiveRestriction broke it).
...
- do not default to loading the E2 rules for tests, so GiveRestriction
will not be set to a default value.
- only load configuration if a ruleset has been defined.
2015-05-24 09:09:34 +02:00
Enno Rehling
eb6215e018
https://github.com/eressea/server/issues/203 terrain_t check was exactly wrong, causing log spam.
...
remove obsolete line from E4 config.
2015-05-22 13:52:45 +02:00
Enno Rehling
3a03579a65
rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070.
2015-05-19 08:27:16 +02:00
Enno Rehling
b7826c8025
Enable rules.owners.force_leave for all running games.
...
https://bugs.eressea.de/view.php?id=2059 "(TEMP?)-Einheit in feindlichem Gebäude nach Kampf"
2015-05-18 07:28:56 +02:00
Enno Rehling
ce94c9805d
rules.give.max_men == -1 für unlimitierte Übergaben in E2
2015-04-28 17:40:41 +02:00
Enno Rehling
293190703f
make maximum number of people transferred to a faction configurable
...
make E2 transfers basically unlimited.
2015-03-13 21:10:39 +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
9ce9cddd1f
I have no idea why this worked, since my eressea/git is a symlink,
...
and that means ../git is not equal to cwd.
2015-01-09 21:53:06 +01:00
Enno Rehling
90dd700487
BREED/PLANT/GROW are technically the same command, merge them.
...
The new parser makes this easy.
2015-01-04 15:11:49 +01:00
Enno Rehling
d67ecdb8cf
Merge pull request #64 from CTD1/Bauern
...
Bauern in leeren Regionen
2014-12-19 20:08:42 +01:00
CTD
c914c83947
Grenze für E2
...
auf 500 Bauern erhöht.
2014-12-18 11:57:30 +01:00
Enno Rehling
440d78596c
Add missing keywords, fix disappearing units.
...
https://bugs.eressea.de/view.php?id=2051
. The orders PASSWORT, FAHRE, KÄMPFE were not recognized (new imperative syntax).
. Added backwards compatibility for FIGHT (now COMBAT).
https://bugs.eressea.de/view.php?id=2050
. units were always giving away ALL persons, not the number in their GIVE command.
2014-12-12 13:32:21 +01:00
Enno Rehling
00ba5538f5
Merge pull request #48 from badgerman/master
...
more refactoring, no new features.
2014-11-02 10:34:37 +01:00
Enno Rehling
bbd4e31cf9
Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot
...
Conflicts:
res/core/de/strings.xml
2014-11-02 10:02:30 +01:00