Commit Graph

5557 Commits

Author SHA1 Message Date
Enno Rehling ae6e161f96 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:26:46 +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
Enno Rehling 920902f8eb replace resource_type::_name array with a single string. 2014-08-24 23:58:30 +02:00
Enno Rehling 4c00777553 make race::_name a string, not an array of strings. add a test for rc_name. 2014-08-24 23:58:29 +02:00
Enno Rehling de5ef3f87b Merge branch 'master' of https://github.com/eressea/server 2014-08-24 17:11:32 +02:00
Enno Rehling 7d17cafdd6 simple tests for build().
cleaning up the code to give it a common setup function.
change the golem code to use flag, not hard-coded race.
unify the golems, make code more readable, kill a block of unused code.
2014-08-24 17:09:32 +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 a1a810a094 segmentation fault 2014-08-24 12:41:39 +02:00
Enno Rehling 1c069da921 segmentation fault caused by new getstrtoken semantics 2014-08-24 12:40:00 +02:00
Enno Rehling 86c2096cfa use full path to preview script from cron. 2014-08-24 00:37:03 +02:00
Enno Rehling 5befbad7c7 Merge branch 'version-3-1'
Conflicts:
	src/laws.c
2014-08-24 00:30:12 +02:00
Enno Rehling f1d78b4b84 fix null-pointer crash. 2014-08-24 00:29:19 +02:00
Enno Rehling 9db6826662 remove unused static function, fix missing include for gcc. 2014-08-23 09:21:40 +02:00
Enno Rehling ad903e83e3 Merge branch 'master' of github.com:badgerman/eressea 2014-08-23 09:18:45 +02:00
Enno Rehling b458c889be Merge branch 'master' of github.com:eressea/server 2014-08-23 09:18:15 +02:00
Enno Rehling 808f343e34 make getstrtoken() return null at EOL, kill init_tokens.
init_order all the things!
added a bunch of new assertions to cover for oversights.
added some new tests for order parsing.
2014-08-23 09:17:58 +02:00
Enno Rehling ee2363a4d9 use init_order, it is better than the init_tokens+skip_token pattern.
test for new_units.
additional testing for init_order (renamed from init_command)and init_tokens.
fixed a memory access error when kwd==NOKEYWORD.
2014-08-23 06:45:20 +02:00
Enno Rehling 6b14eae118 Merge remote-tracking branch 'eressea/master'
Conflicts:
	src/kernel/order.c
2014-08-23 06:17:16 +02:00
Enno Rehling beacb850c6 fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:37:33 +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 e9ccc24895 make previews always build from master 2014-08-22 07:44:52 +02:00
Enno Rehling dea20e94bd New pre-release. 2014-08-22 07:41:28 +02:00
Enno Rehling fd46b25317 Merge branch 'version-3-0'
Conflicts:
	conf/e3/config.xml
2014-08-22 07:40:43 +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 cc0b0ad71b added a test for addfaction.
removing struct player, since it is not in use.
2014-08-20 23:42:33 +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