Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,812 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

144 Commits

Author SHA1 Message Date
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
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
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
Enno Rehling a29e6a7f40 fix segmentation fault in new assert (units without a faction) 2014-10-31 22:20:07 +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
CTD 80819ad4e5 XML Config 
Ich habe mal alle neuen Sachen in die XML Dateien eingetragen, und
gleich noch 2 kleine Bugs behoben (Natürlich Rüstung war wieder aus und
default Arbeiten gab es nicht mehr).
 2014-08-26 10:53:51 +02:00
Enno Rehling bd8d28cfb7 reduce E3 chance to attack to zero for turn re-run 2014-08-20 11:55:17 +02:00
Enno Rehling 68fc4df74d Configurable monster attack chance, default to 40%. 
E3 chance to attack is only 10%.
 2014-08-20 11:54:11 +02:00
Enno Rehling afd41286b5 config file reading based on game name and install location. 2014-08-03 20:37:05 +02:00
Enno Rehling bd2809a975 removing the core directory (moving to res and scripts). 
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
 2014-07-28 14:27:30 +02:00
Enno Rehling 30e9565ae6 update config files to use game.rules from eressea.ini. 
ToDo: set rules from command line with -r
 2014-07-23 12:19:24 +02:00
Enno Rehling 2bec7e2bbe save game id in the data file, not name of XML file 2014-07-23 11:54:51 +02:00
Enno Rehling 956efc48d5 new two-phase reserve for e4 2014-07-20 09:42:45 +02:00
Enno Rehling 740b646e54 fix keywords 2014-06-22 12:38:11 -07:00
Enno Rehling a144417daa remove reference to former GM command (I killed it last week) 2014-06-15 21:22:22 -07:00
Enno Rehling fa256360b9 eliminate kill_nonstarters 2014-06-03 06:29:33 +02:00
Enno Rehling 9940025a96 eliminate multiple warnings about missing default order 
fix e3 catalog file syntax
 2014-06-02 07:31:46 +02:00
Enno Rehling 08c3d08d7d fix config.xml for test games 
update log levels for some common messages.
 2014-06-02 05:42:56 +02:00
Enno Rehling 038ba723ef remove old equipment file from config everywhere 2014-06-01 23:57:45 +02:00
Enno Rehling 1b039feacb save the xml config, before I accidentally nuke it again 2014-06-01 23:49:09 +02:00