Enno Rehling
ce3e9cd7d0
Add missing test coverage for update_guards. Fix the weapon:minskill default.
2014-10-14 18:37:45 +02:00
Enno Rehling
815cf3edbc
Merge branch 'master' of github.com:badgerman/eressea
2014-10-12 21:27:33 +02:00
Enno Rehling
bac3286440
re-implement faction:add_message for Lua.
...
only ancient xmas scripts were using it, but it's a useful function to have.
2014-10-12 21:26:25 +02:00
Enno Rehling
61a1b6fafd
useful scripts for setting up the game.
...
fix silver->money in the build scripts.
config.lua: load the game configuration
reports.lua: write the reports for the (initial) turn
2014-10-10 20:19:04 +02:00
Enno Rehling
fb32ebcd18
segmentation fault in export when a plane has no name (default plane).
2014-10-09 08:34:03 +02: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
595dc1334e
fix new harbor code, add tests.
...
- alliances were checked in the opposite direction
- code crashed when harbor has no owner
2014-10-03 21:26:11 +02:00
Enno Rehling
98b69dc614
Merge branch 'master' of github.com:eressea/server
2014-10-03 19:27:38 +02:00
Enno Rehling
60cc3cc3d3
Merge pull request #37 from CTD1/Hafen2
...
Häfen nur anlaufen mit Helfe Bewache
2014-10-03 19:27:08 +02:00
CTD
6f10ee828c
Merge branch 'Hafen_und_Helfe_bewache' into Hafen2
2014-10-02 18:09:52 +02:00
Enno Rehling
a78daad4d8
Merge pull request #34 from CTD1/Hunger
...
Hunger und Segeltalent
2014-10-01 13:48:51 +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
d0d1ef5af0
Merge branch 'master' of github.com:eressea/server
2014-09-30 17:51:35 +02:00
Enno Rehling
6c2429cccb
Version 3.3 released, build 685
2014-09-30 17:50:29 +02:00
Enno Rehling
4527ffdda2
refactoring and tests for wormhole module.
2014-09-29 23:19:59 +02:00
Enno Rehling
139ff04108
fix compilation warning on gcc.
2014-09-29 21:22:44 +02:00
Enno Rehling
68730749fb
fix astral space special direction, vortex (translation issue).
2014-09-29 21:19:07 +02:00
Enno Rehling
cbf9bb8985
fix qsort in wormhole code. pointers are hard.
2014-09-29 20:38:01 +02:00
Enno Rehling
3e829e2880
support for itoab with smaller bases and larger numbers.
...
also a missing English message (museum-related)
2014-09-29 18:32:12 +02:00
CTD
c937f59536
XML Option hinzugefügt
...
Das Segeln nur 1 Skill Level verliert ist Default und somit an.
2014-09-25 09:54:52 +02:00
Enno Rehling
8432a6369d
guess the ERESSEA environment if it is missing
2014-09-21 16:55:28 +02:00
Enno Rehling
74582aeb2f
fix remaining getstrtoken uses without null-check.
2014-09-21 16:43:17 +02:00
Enno Rehling
a5961d069c
Merge branch 'master' of github.com:eressea/server
2014-09-21 10:00:02 +02:00
Enno Rehling
da42feae58
do not need bash
2014-09-21 09:59:48 +02:00
Enno Rehling
8b19d51c65
Merge branch 'master' of github.com:eressea/server
2014-09-19 19:57:48 +02:00
Enno Rehling
7f0fdd1eb5
added a test for a purely hypopthetical problem (issue 2032) in keyword parsing.
2014-09-19 19:49:44 +02:00
CTD
9e5e7a3e52
Hunger und Segeltalent
...
Hungernde Einheiten verlieren nur noch einen Punkt Segeln (ab T2), nicht
mehr das halbe Talent.
Das sollte die meisten Schiffsunfälle durch vergessene Silber derart
abschwächen, das die Schiffe noch aus eigener Kraft zum nächsten Hafen
kommen.
2014-09-15 16:10:57 +02:00
Enno Rehling
d9e53573b5
Merge pull request #33 from CTD1/Monster
...
Drachen-Attacken in E3 abstellen.
2014-09-06 18:09:42 +02:00
Enno Rehling
b761cb5b97
Merge branch 'master' of https://github.com/eressea/server
2014-09-04 17:22:33 +02:00
Enno Rehling
54cf4f4b7b
Merge branch 'version-3-2'
...
Conflicts:
src/laws.c
2014-09-02 09:26:59 +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
CTD
2875fdddd1
Fixing Monsters
...
Drachen haben die Attacke-Chance Einstellung komplett ignoriert.
Jetzt machen sie zumindest bei 0 nicht mehr.
2014-09-01 15:42:56 +02:00
CTD
37c459cebe
Merge remote-tracking branch 'upstream/master'
2014-09-01 15:27:42 +02:00
Enno Rehling
cf1f3972b6
cleaning out config.c, there is too much code in there.
...
rules should be in their own modules. here:
upkeep is a concept all by itself, should have its own tests, etc.
movement code should be in move.c.
cleaning up some superfluous include directives.
2014-08-31 16:50:37 +02:00
Enno Rehling
ae9ed99cd9
fixing linux build
2014-08-29 07:47:47 +02:00
Enno Rehling
e9abfc0f24
peasant blood should not have ill effects on non-demon units that are empty.
...
This fixes http://bugs.eressea.de/view.php?id=1981
2014-08-28 20:01:37 +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
Enno Rehling
932a615837
refactoring: special directions into their own file (vortex.c).
...
moving spells.c out of spells.
figured that movewhere should be in move.c
2014-08-27 21:30:24 +02:00
Enno Rehling
ecaeba3058
add a test for the vortex special direction before touching that code.
2014-08-27 20:10:17 +02:00
Enno Rehling
a9a0455207
reorganized directory structure.
...
flattening the directory structure, moving some modules to the src/ directory.
making stealth a separate file, under test.
more tests for some stuff.
2014-08-27 06:40:35 +02:00
Enno Rehling
d435c13bfc
adding more tests.
...
test for build()
test for scale_number()
update submodules
2014-08-26 20:06:49 +02:00
CTD
3fd4a29356
rules.reserve.twophase für alle Spiele
2014-08-26 16:19:59 +02:00
CTD
ee77a15f50
Häfen nur anlaufen mit Helfe Bewache
...
Ein Hafen kann nur noch angelaufen werden, wenn der Besitzer Helfe
Bewache oder Kontaktiere zum Kapitän gesetzt hat, oder wenn es die selbe
Partei ist. Das spart viel Micromgmt (Hafen ein und ausschalten), ist
vor allem jedoch wichtig in Verbindung mit dem neuen Feature das der
Regionsbesitzer auch den Hafen (und vieleicht auch noch den Leuchtturm)
betreibt.
2014-08-26 11:27:16 +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
CTD
b321385f34
Merge remote-tracking branch 'origin/Bug-1525-and-1872'
...
Conflicts:
src/kernel/move.c
2014-08-26 09:31:18 +02:00
Enno Rehling
2ceeb0b819
fix errors that gcc finds
2014-08-25 08:15:51 +02:00
Enno Rehling
2211111b29
Remove a German-only piece of text, to reduce the footprint of fleets in the report a little.
...
Fix English score message in NR.
Small fixes to meet Visual Studio warning level 4.
2014-08-25 00:45:32 +02:00
Enno Rehling
e87b1cf372
an experiment to have deterministic sort order for known factions in the report.
2014-08-25 00:06:33 +02:00
Enno Rehling
a3037950ff
fix a bug in the escape_string function.
...
remove static return variable from escape_string.
add test coverage.
2014-08-24 23:58:31 +02:00