cc0b0ad71b
added a test for addfaction.
...
removing struct player, since it is not in use.
2014-08-20 23:42:33 +02:00
acfe72f24e
add a test for get_monsters().
...
I want to make sure I don't break this in the future.
2014-08-20 07:00:58 +02:00
e69fb78e6b
Monster attackieren keine Einheiten in Gebäuden.
2014-08-19 15:31:16 +02:00
3fde10d9e8
Configurable monster attack chance, default to 40%.
...
E3 chance to attack is only 10%.
2014-08-19 15:24:30 +02:00
59ccf23db6
Repair MAKE, which broke when I changed MAKE TEMP.
...
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
2014-08-17 14:47:39 +02:00
99124f3d6d
Merge branch 'master' of https://github.com/eressea/server
2014-08-17 07:37:50 +02:00
b385bfc4d2
Merge branch 'fixes-891'
...
Conflicts:
src/kernel/faction.c
2014-08-17 07:23:07 +02:00
138a4c10a0
properly create missing monster faction when spawning dragons.
...
remove cached monster faction (static).
Conflicts:
src/kernel/faction.c
2014-08-17 07:14:47 +02:00
8f09ab73d9
fix display of alliance status, some English translation hiccups.
2014-08-17 00:14:50 +02:00
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
8803a9e9a8
properly create missing monster faction when spawning dragons.
2014-08-16 13:46:34 +02:00
90ec28fed3
fix missing monster factions.
2014-08-16 13:33:47 +02:00
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
9587e9f0cd
remove unused variables
2014-08-16 12:02:45 +02:00
2fd085d1e5
Merge branch 'master' of https://github.com/eressea/server
2014-08-16 11:59:20 +02:00
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
41d42fa248
localization of alliance status "ALL".
...
fix for https://bugs.eressea.de/view.php?id=1993
2014-08-16 03:07:37 +02:00
61ebd1d6b7
fix accidental assignment instead of comparison.
2014-08-14 20:08:29 +02:00
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
158d4f8d4b
MSVC: compile cleanly with level 4 warnings
2014-08-14 19:39:45 +02:00
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
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
ff73358b9c
Some tiny errors that slipped through Visual Studio's warnings.
2014-08-14 09:59:33 +02:00
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
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
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
bdbffba68e
Fixing Merge conflict
2014-08-14 02:06:24 +02:00
6afd8ab586
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/laws.c
2014-08-14 00:23:41 +02:00
a1225a1269
Merge remote-tracking branch 'origin/Feature-1865'
2014-08-14 00:16:12 +02:00
dfec8d8001
Merge remote-tracking branch 'origin/Verlasse-zu-spät-in-Befehlsreihenfolge'
...
Conflicts:
src/laws.c
2014-08-14 00:14:51 +02:00
d546065bfd
Merge remote-tracking branch 'origin/Piraterie'
2014-08-13 23:59:09 +02:00
f45b16e9a4
Merge remote-tracking branch 'origin/Bug-1938'
2014-08-13 23:58:30 +02:00
13e544a233
Merge remote-tracking branch 'origin/Bug-1857'
2014-08-13 23:57:43 +02:00
0e8126f538
Merge remote-tracking branch 'origin/Bug-1664'
2014-08-13 23:56:56 +02:00
df1a4b5a47
Merge remote-tracking branch 'origin/Bug-1516'
2014-08-13 23:33:27 +02:00
444971542c
fix missing curly brace, indentation. hope I got this right.
2014-08-13 19:55:10 +02:00
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
233f707780
Merge remote-tracking branch 'origin/Bug-1610'
2014-08-13 15:56:44 +02:00
0a4962fbfd
Published a new release.
2014-08-13 00:27:00 +02:00
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
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
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
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
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
90cf6d845f
replace strstr
...
Neu Funktion check_param die überprüft ob ein übergebener Wert in dem
Wert des entsprechenden Parameters steht.
2014-08-08 13:29:26 +02:00
8dd4b783b1
fix gcc error
2014-08-08 01:26:35 +02:00
3767957caa
indentation + whitespace changes
2014-08-08 01:24:12 +02:00
1918f56990
indentation + whitespace changes
2014-08-08 01:16:35 +02:00
bf4bda36a2
Bug 1610 FOLGE SCHIFF und andere lange Befehle
...
FOLGE SCHIFF ist genau wie FOLGE EINHEIT jetzt ein Halblanger Befehl.
Das ist konsequent und entfernt an einigen Stellen Spezialbehandlungen.
2014-08-08 01:14:58 +02:00
f33de38812
Piraterie repariert
...
Die Piraten sind oftmals einfach in ein falsches (leeres) Ozeanfeld
gesegelt, wenn es irgendwo ein Opfer gab.
2014-08-08 01:14:57 +02:00
Enno Rehling
CTD