Commit Graph

58 Commits

Author SHA1 Message Date
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 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 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 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
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 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 1b44e73320 remove prefixes.xml from E2 2015-09-12 13:35:59 +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 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 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
CTD c914c83947 Grenze für E2
auf 500 Bauern erhöht.
2014-12-18 11:57:30 +01:00
Enno Rehling 6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling 077d7d8d49 cmp_taxes ruft regionowner() auf, und das hat ein assert, welches
testet das die Regel für Regionsbesitz aktiv ist. E2 hat aber keine
Regionsbesitzer. Ergo kann in E2 auch der Regionebesitzer nicht für
Leuchttürme zahlen, der Eintrag aus config.xml muss da wieder raus.
2014-10-06 07:17:46 +02:00
Enno Rehling 49128bdc79 syntax error in configuration files 2014-10-05 19:31:47 +02:00
Enno Rehling 232b935e0f Merge pull request #31 from CTD1/XML_config_changes
Xml config changes
2014-10-01 13:47:23 +02:00
Enno Rehling c0230d2662 In the game, there is only ever one special direction, and it is for the astral space.
less XML, more code.
cleaning up the special direction parsing a bit.
2014-08-28 19:50:38 +02:00
CTD 3fd4a29356 rules.reserve.twophase für alle Spiele 2014-08-26 16:19:59 +02:00