Commit Graph

4687 Commits

Author SHA1 Message Date
Enno Rehling cef068fe9b cut the number of allocations for order-data in half.
started writing a test file for orders.
2014-08-16 23:26:31 +02:00
Enno Rehling bb9d59bac5 read turn file before sending 2014-08-16 18:57:06 +02:00
Enno Rehling d880de0b2a fix preview send script 2014-08-16 18:23:44 +02:00
Enno Rehling 8803a9e9a8 properly create missing monster faction when spawning dragons. 2014-08-16 13:46:34 +02:00
Enno Rehling 90ec28fed3 fix missing monster factions. 2014-08-16 13:33:47 +02:00
Enno Rehling fa52bb4192 pointless assert triggers when new units are created and placed.
spawning dragons was causing this to fail.
2014-08-16 13:19:00 +02:00
Enno Rehling 9587e9f0cd remove unused variables 2014-08-16 12:02:45 +02:00
Enno Rehling 2fd085d1e5 Merge branch 'master' of https://github.com/eressea/server 2014-08-16 11:59:20 +02:00
Enno Rehling 8cc4a53077 cron for eressea previews 2014-08-16 11:43:46 +02:00
Enno Rehling c79dd33bfb smarter processing of MAKE TEMP.
the order gets its own keyword. parsing is hard - composite commands are an anti-pattern.
this eliminates a lot of unnecessary mallocs for pushing/poping parser state.
2014-08-16 11:41:19 +02:00
Enno Rehling 41d42fa248 localization of alliance status "ALL".
fix for https://bugs.eressea.de/view.php?id=1993
2014-08-16 03:07:37 +02:00
Enno Rehling 643e2bc40f Merge branch 'CTD1-Bug-1525-and-1872' 2014-08-14 20:09:06 +02:00
Enno Rehling 61ebd1d6b7 fix accidental assignment instead of comparison. 2014-08-14 20:08:29 +02:00
Enno Rehling fa0c999d3e Merge branch 'Bug-1525-and-1872' of github.com:CTD1/eressea-server-bugfixing into CTD1-Bug-1525-and-1872 2014-08-14 20:06:14 +02:00
Enno Rehling 158d4f8d4b MSVC: compile cleanly with level 4 warnings 2014-08-14 19:39:45 +02:00
Enno Rehling 804734d013 MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable)
make a single object from all generated binding code.
this setup is unusual, but easier to maintain.
2014-08-14 19:39:17 +02:00
CTD 7dd86959a9 Bewegung durch Region blockieren
Etwas größerer Umbau. Befreundete Wachen erlauben nicht mehr automatisch
die Durchreise.  Es werden sowohl die Befreundeten als auch die
Feindlichen Bewacher in der Region gezählt, und die Differenz mit
rules.guard.guard_number_stop_prob multipliziert. Bei 700 Feindlichen
und keinen freundlichen Wachen ist die Chance dann 100%. Bei 100
Feindlichen und 400 freundlichen ist sie 0.
Zusätzlich gibt rules.guard.castle_stop_prob 10% pro Burgenlevel für den
Burgenbesitzer.
rules.guard.region_type_stop_prob gibt 10% für Regionen mit weniger
Begehbaren Pfaden (Berge und Vulkane) und das doppelte für sehr schwer
passierbare Regionen (Sümpfe und Gletscher).

Für Spiele mit Wahrnehmung (E2) sollten die Werte für:
rules.guard.skill_stop_prob
rules.guard.castle_stop_prob
rules.guard.region_type_stop_prob

auf 5% Angepasst werden.
2014-08-14 12:37:59 +02:00
Enno Rehling ff73358b9c Some tiny errors that slipped through Visual Studio's warnings. 2014-08-14 09:59:33 +02:00
Enno Rehling dafe71f4b8 micro optimizations.
removing a lot of mallocs through strdup  by replacing getcommand calls with get_command, which takes a buffer. only one left.
removing mkname calls with a static buffer for keyword-tokens.
commit the schema file I had lying around.
2014-08-14 09:57:05 +02:00
Enno Rehling 9ca206ec3f remove reference to thieves and spies from this spell for non-E2 games.
this fixes https://bugs.eressea.de/view.php?id=1548
2014-08-14 07:05:12 +02:00
Enno Rehling 7eb21611ce Adjust the weight of young dragons to be less than regular dragons.
This fixes https://bugs.eressea.de/view.php?id=1677
2014-08-14 06:29:45 +02:00
Enno Rehling 38352ef3bf add the build number to saves.
this should make future debugging sessions easier, telling us what bugs were or were not fixed at the time of an incident.
added a test to make sure data file can be read/written, and at a minimum, sets global data-version.
also clean up test framework a bit, and introduce a helpful macro.
2014-08-14 05:06:36 +02:00
Enno Rehling 911992b04d silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013
this broke when I replaced the new_itemtype function. I owe a test for it.
2014-08-14 03:48:39 +02:00
CTD bdbffba68e Fixing Merge conflict 2014-08-14 02:06:24 +02:00
CTD 6afd8ab586 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/laws.c
2014-08-14 00:23:41 +02:00
CTD a1225a1269 Merge remote-tracking branch 'origin/Feature-1865' 2014-08-14 00:16:12 +02:00
CTD dfec8d8001 Merge remote-tracking branch 'origin/Verlasse-zu-spät-in-Befehlsreihenfolge'
Conflicts:
	src/laws.c
2014-08-14 00:14:51 +02:00
CTD d546065bfd Merge remote-tracking branch 'origin/Piraterie' 2014-08-13 23:59:09 +02:00
CTD f45b16e9a4 Merge remote-tracking branch 'origin/Bug-1938' 2014-08-13 23:58:30 +02:00
CTD 13e544a233 Merge remote-tracking branch 'origin/Bug-1857' 2014-08-13 23:57:43 +02:00
CTD 0e8126f538 Merge remote-tracking branch 'origin/Bug-1664' 2014-08-13 23:56:56 +02:00
CTD df1a4b5a47 Merge remote-tracking branch 'origin/Bug-1516' 2014-08-13 23:33:27 +02:00
Enno Rehling 444971542c fix missing curly brace, indentation. hope I got this right. 2014-08-13 19:55:10 +02:00
Enno Rehling 77f126a0bd Merge branch 'CTD1-Feature-1865' 2014-08-13 19:45:09 +02:00
Enno Rehling b6f627a5d8 Merge branch 'Feature-1865' of github.com:CTD1/eressea-server-bugfixing into CTD1-Feature-1865
Conflicts:
	src/economy.c
2014-08-13 19:44:57 +02:00
CTD 233f707780 Merge remote-tracking branch 'origin/Bug-1610' 2014-08-13 15:56:44 +02:00
Enno Rehling 0a4962fbfd Published a new release. 2014-08-13 00:27:00 +02:00
Enno Rehling 206e0a2fc5 Accidentally deleted initial path logic.
This code is important for bootstrapping the LUA_PATH
2014-08-12 23:15:35 +02:00
Enno Rehling f0ac736bd1 map script needs to set up the script folder. 2014-08-12 23:06:44 +02:00
Enno Rehling b0203a2cef fix iniparser build 2014-08-12 22:59:26 +02:00
Enno Rehling 91ec503b43 fix the mapper script.
1. move xml configuration reading to a separate module, it's compliated.
2. move the map file to the main scripts folder.
2014-08-12 22:54:55 +02:00
Enno Rehling 6fbb9b46ca modifying ini file from setup script 2014-08-12 22:00:26 +02:00
Enno Rehling ca64be7868 setup script to install the server 2014-08-12 17:34:02 +02:00
Enno Rehling 52a235b153 make clean, to remove emacs backup files 2014-08-12 15:38:30 +02:00
Enno Rehling 04be680bd5 refactoring the pre-release script.
1. tests are now done in a subdiretory od the live server.
2. usage is easier, with commands.
3. using getopts for command-line parsing is cool.
2014-08-11 13:41:37 +02:00
Enno Rehling 3c2ae7ca93 preview script and logging cleanup
1. all log messages will be terminated with \n, whether the user provided
	it or not.
2. remove a bunch of print() calls from scripts to reduce clutter
3. replace printf calls with log_* calls to reduce clutter
4. add the new release preview script
2014-08-11 12:04:12 +02:00
Enno Rehling 130f6401b7 No christmas trees in E4
- Bugfix for http://bugs.eressea.de/view.php?id=2019
- removing some old tests
2014-08-10 23:07:25 +02:00
Enno Rehling 45a16681c4 logic fix for FOLLOW (if we are not following a ship, and cannot see the target unit, then exit). 2014-08-08 18:18:17 +02:00
CTD 53a5314463 Fix für E2
Die Abfrage der Option war ohne Default, so das sie hier immer an war.
In E2 führ das dann wegen cmp_taxes zur assertion.

Das wars, jetzt sollte alles rund sein.
2014-08-08 17:27:13 +02:00
CTD fe0ff71aa1 E2 fähig gemacht
Der Burgenbesitzer sieht nur noch etwas wenn er auch Leuchtturmbesitzer
ist.
Das geht jetzt auch für E2 ohne region_owner rule.
2014-08-08 17:15:12 +02:00