Enno Rehling
8e15487a1e
BUG 2328: wrong calendar seasons.
2017-05-26 06:27:25 +02:00
Enno Rehling
4fdfbb44b5
this config.xml was added by accident.
2017-05-08 08:15:18 +02:00
Enno Rehling
18defdd5a2
remove last pieces of calendar.xml
2017-05-08 06:57:03 +02:00
Enno Rehling
80ab32cf51
remove calendar.xml from rules.
2017-05-07 17:48:59 +02:00
Enno Rehling
7806f4991f
store calendar configuration nin JSON, not XML.
2017-05-07 17:46:51 +02:00
Enno Rehling
f2bb51b3ab
Merge branch 'master' into develop
...
Conflicts:
res/adamantium.xml
res/core/resources/laen.xml
scripts/tests/common.lua
scripts/tests/e2/adamantium.lua
scripts/tests/e2/e2features.lua
scripts/tests/e2/items.lua
scripts/tests/items.lua
src/bind_unit.c
src/economy.test.c
src/kernel/resources.c
src/util/attrib.c
2017-03-26 21:01:21 +02:00
Enno Rehling
733c754e0f
rename some configuration options.
...
add them to the valid keys for eressea.ini, too.
2017-03-25 14:15:01 +01:00
Enno Rehling
49140f131e
allow PROMOTION and PROMOTE alternatives.
...
German already allows this, and my ECheck change made it necessary for English, too:
https://bugs.eressea.de/view.php?id=2280
2017-03-17 20:30:07 +01:00
Enno Rehling
ac12cb966d
implement fixed wage functions, select by constant value
2017-03-16 16:07:52 +01:00
Enno Rehling
8cfcffc4aa
remove data_turn and gamename from global settings.
...
make run-turn.sh work without valgrind
2017-03-13 09:19:37 +01:00
Enno Rehling
be14394529
load locales and rules separately (xml prep work)
2017-02-19 16:33:24 +01:00
Enno Rehling
b05c2564e5
make att_modification not crash when a good/bad dream curse has no magician.
2017-02-12 13:22:44 +01:00
Enno Rehling
3b3e39a319
optimization: elf-special "regen.forest" is now a config.
...
this is an E3 feature
eliminates rc.parameters for elves
allows use of a local cached static
2017-02-04 23:21:36 +01:00
Enno Rehling
ae83448e4a
Deveron is now just E3 with a different name.
...
remove a lot of duplication.
add a -c option to specify a path for eressea.ini
2017-02-02 10:10:21 +01:00
Enno Rehling
d794ad4433
Eressea config requires game.id
...
At home, I am running all games from the same directory for testing, and cannot use eressea.ini for setting game.id
Override it in eressea.ini for other games.
2017-01-28 20:02:15 +01:00
Enno Rehling
30665f874a
fix game_name, remove it from rules
2017-01-22 20:32:54 +01:00
Enno Rehling
9ccaab6516
Korrekte Email-Subject und Adresse, auch im NR.
...
Eliminate crufty per-game strings.
2017-01-22 20:19:32 +01:00
Enno Rehling
4cbeb03590
clean the quipment interface for lua a little bit.
2017-01-22 18:35:54 +01:00
Enno Rehling
d29fd96f59
no starting equipment.
...
do not let the addplayer function give equipment.
rename equipment for autoseed.
2017-01-22 08:05:19 +01:00
Enno Rehling
446e58c383
use the email address from eressea.ini in CR mailto
2017-01-22 04:46:36 +01:00
Enno Rehling
1b2bfc7995
rename [eressea] section to [game]
2017-01-20 19:43:53 +01:00
Enno Rehling
0261cb45c1
move orders-accept configuration to eressea.ini
...
install lunit, too
2017-01-20 08:32:31 +01:00
Enno Rehling
ce17d7f2d7
enable PAY NOT in E2
2016-12-31 21:21:23 +01:00
Enno Rehling
bf70792da6
make kn-bremen.de official email address
2016-11-27 16:07:46 +01:00
Enno Rehling
ec4060cb9a
fix curse-vigour calculation math.
...
also fix a ton of small other niggles from pvs-studio.
2016-11-20 19:08:39 +01:00
Enno Rehling
e50dfbf42b
fix terrains.json, reduce config.h use
2016-11-15 23:56:39 +01:00
Enno Rehling
83ea1077a3
delete default terrain.
...
github issue #538
2016-11-15 23:37:30 +01:00
Enno Rehling
402c19d8fc
dn't warn new player about NMR.
...
newbie info text was no longer valid.
2016-09-11 16:35:55 +02:00
Enno Rehling
a08ad52809
Merge branch 'develop'
...
Conflicts:
src/util/log.c
2016-08-31 18:15:07 +02:00
Enno Rehling
6ca3f04b89
issue #538 : default terrain
...
I think it's unnecessary, so delete it
2016-08-20 23:42:15 +02:00
Enno Rehling
43c2c74d75
correct the list of glacier herbs.
...
this will fix newly created glaciers only.
there are several bad glaciers in E2, this commit is not repairing
them.
https://bugs.eressea.de/view.php?id=2220
2016-08-13 10:13:22 +02:00
Enno Rehling
a834c486d9
fix a FIXME: setting default order through config, making test better.
...
this feature is not in use, so all this work is really pointless.
2016-04-09 19:05:28 +02:00
Enno Rehling
547532bc63
remove deprecated learn_skill function and configuration
2016-03-24 22:31:07 +01:00
Enno Rehling
fcc26bcbf3
fix broken json
2016-03-12 15:06:45 +01:00
Steffen Mecke
11b8d85167
fixed reversed logic for demon peasant hunger (bug 2187)
...
renamed config variable hunger.demons to hunger.demons.peasant_tolerance and reversed reversed logic in upkeep.c
2016-02-28 16:15:48 +01:00
Steffen Mecke
bd5d3376d5
fixing booleans in config
...
see cf08cdf3fb
2015-12-30 14:05:42 +01:00
Enno Rehling
2aafb841a5
Merge branch 'master' into develop
...
Conflicts:
res/core/messages.xml
scripts/eressea/e3/init.lua
scripts/eressea/xmas.lua
scripts/eressea/xmasitems.lua
src/buildno.h
src/laws.c
2015-12-26 14:46:20 +01:00
Enno Rehling
e574919555
Merge branch 'master' of github.com:eressea/server
2015-12-26 14:40:21 +01:00
Enno Rehling
92636cfcd9
put the new(ish) email subject line in the CR,
...
as reported in https://bugs.eressea.de/view.php?id=2016
2015-12-26 11:05:03 +01:00
Enno Rehling
274322c5b2
fix desert.road in E3 also for 3.7.x
2015-12-20 20:16:13 +01:00
Enno Rehling
ee4480250f
https://bugs.eressea.de/view.php?id=2172
...
desert.road was wrong (probably from migrating XML to JSON)
2015-12-05 17:30:25 +01:00
Enno Rehling
6ad5db8e22
Merge pull request #397 from stm2/taxing_message
...
taxing without skill does not fail silently any more
2015-11-26 18:43:57 +01:00
Enno Rehling
5b9333f6d9
Merge branch 'release-3.7' into develop
...
Conflicts:
src/buildno.h
src/monsters.c
2015-11-23 17:12:48 +01:00
Enno Rehling
c7ab0e8f59
fix https://bugs.eressea.de/view.php?id=2164 (ships get no damage when they drift).
...
simplify attack_chance configuration, set it only once.
this way, I can more easily fudge it to 1.0 in the debugger.
2015-11-23 12:37:42 +01:00
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
Steffen Mecke
493b45c832
taxing without skill does not fail silently any more
...
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
2015-11-14 15:36:14 +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