Enno Rehling
b4f6e3c21d
fix remaining getstrtoken uses without null-check.
...
Conflicts:
src/economy.c
src/items.c
src/kernel/config.c
src/laws.c
2014-09-21 16:51:05 +02:00
Enno Rehling
c5be92a7fc
fix preview scripts to auto-checkout master
2014-09-21 10:03:48 +02:00
Enno Rehling
f6e976296e
change to the right directory before running previews.
2014-09-21 09:56:15 +02:00
Enno Rehling
9e81de406b
version 3.2
...
remove regatta plane, it crashes all of a sudden.
why is there a use of init_order here? that is a future feature.
2014-09-02 07:27:11 +02:00
Enno Rehling
2246ce9d7a
segmentation fault caused by new getstrtoken semantics
...
Conflicts:
src/laws.c
2014-08-24 12:43:18 +02:00
Enno Rehling
87720c2b9c
segmentation fault
2014-08-24 12:42:38 +02:00
Enno Rehling
f1d78b4b84
fix null-pointer crash.
2014-08-24 00:29:19 +02:00
Enno Rehling
b2dc6a3a9d
fix MAKE TEMP, for real this time. I hate skip_token and all that stuff.
2014-08-23 00:35:06 +02:00
Enno Rehling
1dcb14cfb9
Revert "silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013 "
...
This reverts commit 911992b04d
.
2014-08-22 20:15:44 +02:00
Enno Rehling
8d30d73bb4
fix preview script sending to testers.txt
2014-08-21 19:50:03 +02:00
Enno Rehling
a84e628522
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-21 07:31:28 +02:00
Enno Rehling
aed64a70fb
cut the number of allocations for order-data in half.
...
started writing a test file for orders.
2014-08-21 07:30:50 +02:00
Enno Rehling
7b3a381500
increase version number to 3.1
...
log an error when trying to create an order for a disabled keyword
monsters might be trying to TAX in E3?
2014-08-20 19:26:37 +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
fb7c8a898f
add a test for get_monsters().
...
I want to make sure I don't break this in the future.
2014-08-20 08:18:47 +02:00
Enno Rehling
5c7b93d0ce
Monster attackieren keine Einheiten in Gebäuden.
2014-08-20 08:18:26 +02:00
Enno Rehling
b385bfc4d2
Merge branch 'fixes-891'
...
Conflicts:
src/kernel/faction.c
2014-08-17 07:23:07 +02:00
Enno Rehling
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
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