Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
8053 commits 10 branches 0 tags 41 MiB
Commit graph

2747 commits

Author SHA1 Message Date
Enno Rehling
10e78b1455 remove code for dict and lua .objects properties. 
rewrite muschelplateau code to use keys.
 2017-02-11 22:15:21 +01:00
Enno Rehling
853f63b501 delete unitmessage trigger, it is unused 2017-02-11 20:27:13 +01:00
Enno Rehling
2ee0e599b1 initialize game after loading config 2017-02-11 17:38:39 +01:00
Enno Rehling
b504899b07 fix locale initialization 2017-02-09 23:28:50 +01:00
Enno Rehling
f48dd41538 fix a segfault in free_Races 2017-02-07 21:37:38 +01:00
Enno Rehling
60497da87b print error message when missing parameter translation. 2017-02-07 20:52:31 +01:00
Enno Rehling
9c6a72f55e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-07 18:23:12 +01:00
Enno Rehling
8ffa091936 do not abort xml parsing when there is no calendar 2017-02-06 20:34:11 +01:00
Enno Rehling
d851554ebe MSVC doesn't like to do integer->char conversions. 2017-02-06 18:16:34 +01:00
Enno Rehling
baf3275eba valgrind: always terminate options 2017-02-06 11:52:07 +01:00
Enno Rehling
2267373b2e gcc warning 2017-02-06 10:44:11 +01:00
Enno Rehling
28c951bdfd eliminate race.parameters. 
move all special properties to race.options
 2017-02-06 09:46:36 +01:00
Enno Rehling
998dcffab2 introduce an rcoption struct. 
used for pretty rare options that have no property in the race struct.
 2017-02-06 09:03:08 +01:00
Enno Rehling
492aba543b delete at_scare 
delete dead code (race.attribs has no at_skillmod)
delete race.attribs
 2017-02-05 19:30:09 +01:00
Enno Rehling
67414f29eb wrap ai.scare and at_scare in rc_set_param 2017-02-05 19:26:07 +01:00
Enno Rehling
f2ed2c892a bugfix: Drachen "scare" attribut 
muss mit MOD, nicht AND angewendet werden. rng_int() & 400 ist eine bekloppte Rechnung.
 2017-02-05 18:42:06 +01:00
Enno Rehling
bd836b76e1 channel XML race.parameters through a single, tested, function 2017-02-05 16:55:51 +01:00
Enno Rehling
0b3d15f4b3 eliminate unused other_cost parameter. 
cost of other races is defined by their recruitcost.
 2017-02-04 23:46:26 +01:00
Enno Rehling
bdb50eab75 make migrants.formula a flag. 
lookup in race.parameters was slow.
there is only one formula, anyhow.
 2017-02-04 23:44:25 +01:00
Enno Rehling
3b3e39a319 optimization: elf-special "regen.forest" is now a config. 
this is an E3 feature
eliminates rc.parameters for elves
allows use of a local cached static
 2017-02-04 23:21:36 +01:00
Enno Rehling
2ecbf89f1a clean up and test various race.parameters 2017-02-04 23:16:16 +01:00
Enno Rehling
2be1868ff0 Antiemagiekristall Meldung geht an die Region. 
Nicht nur an die Partei, die es zaubert.
http://bugs.eressea.de/view.php?id=1987
 2017-02-03 21:48:03 +01:00
Enno Rehling
644a6019a6 do not call isdigit with a negative value. 
http://bugs.eressea.de/view.php?id=1987#c6941
 2017-02-03 21:19:39 +01:00
Enno Rehling
bb37e423e1 use UFL_FOLLOWED for optimization. 2017-02-03 20:35:15 +01:00
Enno Rehling
70b12ae6ca refactor handling of race.param in XML 2017-02-03 20:16:44 +01:00
Enno Rehling
250227cad2 store maxaura as an integer, not a float. 2017-02-03 20:06:01 +01:00
Enno Rehling
e51742da90 use rc_maxaura wrapper everywhere. 2017-02-03 19:50:48 +01:00
Enno Rehling
f22cc3b419 add a test for max_spellpoints 2017-02-03 19:47:30 +01:00
Enno Rehling
1c347ca5ba race.healing is now an int percentage, not a float multiplier 2017-02-03 18:18:55 +01:00
Enno Rehling
fd9583df3d fix healing for elves in a forest. 
rename _magres back to magres.
rc->parameters is not linked to config_changed invalidation.
add tests.
 2017-02-03 17:43:40 +01:00
Enno Rehling
7750297dc2 express race.magres as percentage, not probability (double->int) 2017-02-03 10:57:32 +01:00
Enno Rehling
7009f26ee5 code duplication, lazy_spell was almost the same as spellref. 2017-02-02 20:18:20 +01:00
Enno Rehling
456d1bd196 spellbooks should not use spellref, it's unnecessary. 2017-02-02 20:08:04 +01:00
Enno Rehling
7e69149c40 WIP: spellref everywhere 2017-02-02 16:52:32 +01:00
Enno Rehling
abed38db0c uninitialized variable. 2017-02-02 10:19:39 +01:00
Enno Rehling
ae83448e4a Deveron is now just E3 with a different name. 
remove a lot of duplication.
add a -c option to specify a path for eressea.ini
 2017-02-02 10:10:21 +01:00
Enno Rehling
534e5874e9 Merge branch 'gmtool' into develop 
Conflicts:
	src/util/unicode.test.c
 2017-01-31 22:19:00 +01:00
Enno Rehling
2b3617a998 build versioning for pre-release builds 2017-01-30 10:35:59 +01:00
Enno Rehling
3d8d091207 new build scripts, new versioning system 2017-01-30 10:26:08 +01:00
Enno Rehling
7cf07e359b Merge remote-tracking branch 'eressea/develop' into develop 2017-01-29 14:20:10 +01:00
Enno Rehling
93be6eb642 Merge branch 'master' into develop 2017-01-29 13:33:30 +01:00
Enno Rehling
6eded43ce9 Merge branch 'master' into hotfix/3_10_5 2017-01-29 13:03:27 +01:00
Enno Rehling
bf22cbc2ef increase MAXTEACHERS again (permament fix in 3.11) 2017-01-29 11:30:22 +01:00
Enno Rehling
36d884143e Bug 2278: Neue Magier können nicht gelehrt werden. 
http://bugs.eressea.de/view.php?id=2278
 2017-01-29 11:06:08 +01:00
Enno Rehling
2016a9ef20 unused function 2017-01-28 20:07:31 +01:00
Enno Rehling
11c0330de1 make race::attack use spellref, too. 2017-01-28 19:52:28 +01:00
Enno Rehling
6d15767a18 create a spellref structure. 
use this when referring to spells that may not (yet) exist.
use it for race::precombatspell (rare use case).
 2017-01-28 19:42:20 +01:00
Enno Rehling
146cb9b00d fix merge conflict 2017-01-26 19:19:40 +01:00
Enno Rehling
e47957ae8e Merge branch 'develop' into clibs 2017-01-26 19:06:14 +01:00
Enno Rehling
23b211d9e4 fix study.c teacher messaging 2017-01-26 18:58:29 +01:00
Enno Rehling
57f6c56e89 remove quicklist shim, use selist everywhere 2017-01-26 18:07:34 +01:00
Enno Rehling
21514f3bfe BESCHREIBE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling
2a1ead6506 BENENNE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling
044953e4ab add a function to compare size of occupied castles 2017-01-26 18:06:49 +01:00
Enno Rehling
c0692986b2 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-26 18:06:48 +01:00
Enno Rehling
d8770932f0 fix issue #477 (intermittent volcano) 2017-01-26 18:06:48 +01:00
Enno Rehling
a79e5ef2a5 refactor and annotate volcano outbreaks. 
add configuration options to control volcano behavior.
 2017-01-26 18:06:48 +01:00
Enno Rehling
af1ce9b84e issue #633: parse FACTION/PARTEI in any language. 
added a test since the first fix did not work.
 2017-01-26 18:06:48 +01:00
Enno Rehling
1bd6ab11ea FACTION and PARTEI should both start orders. 2017-01-26 18:06:48 +01:00
Enno Rehling
21b617c973 fix game_name, remove it from rules 2017-01-26 18:06:48 +01:00
Enno Rehling
ee88c13732 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-26 18:06:48 +01:00
Enno Rehling
98be6bb8ae eliminate duplicate password message 2017-01-26 18:06:48 +01:00
Enno Rehling
76af048fed clean the quipment interface for lua a little bit. 2017-01-26 18:06:48 +01:00
Enno Rehling
64e45248dc rename create_equipment function 2017-01-26 18:06:48 +01:00
Enno Rehling
e7a41a2017 missing includE 2017-01-26 18:06:48 +01:00
Enno Rehling
f4e25fe20e try loading config.lua and custom.lua files, if they exist. 2017-01-26 18:06:48 +01:00
Enno Rehling
f86d86d4c6 Revert "remove sqlite3 code and dependency" 
This reverts commit 7b55a57610.
 2017-01-26 18:06:48 +01:00
Enno Rehling
59916d1d5c remove sqlite3 code and dependency 2017-01-26 18:06:48 +01:00
Enno Rehling
6e51570229 remove ERESSEA keyword from "bad password" message. 2017-01-26 18:06:16 +01:00
Enno Rehling
48ae12b629 emit a password message for newbie factions 2017-01-26 18:06:16 +01:00
Enno Rehling
d3d72d17e8 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-26 18:06:15 +01:00
Enno Rehling
847cfb5425 game.start in eressea.ini overrides calendar 2017-01-26 18:06:15 +01:00
Enno Rehling
0496c66028 use FACTION in text template, not ERESSEA 2017-01-26 18:06:15 +01:00
Enno Rehling
39375e8d4a use the email address from eressea.ini in CR mailto 2017-01-26 18:06:15 +01:00
Enno Rehling
4836e9530c config.json settings shall not override eressea.ini 2017-01-26 18:06:15 +01:00
Enno Rehling
82193864c5 fix valgrind error. 
I did not understand what keys look like, then effed up when fixing that.
 2017-01-26 18:06:15 +01:00
Enno Rehling
dbc6a17e66 fix gcc build, introduce a hard limit on ini section size 2017-01-26 18:06:15 +01:00
Enno Rehling
c6584d83d2 issue #629: fix eressea.ini config 
fixed reading of ini data into config (keys have a . here, not a :).
added a test.
removed obsolete global.inifile variable.
 2017-01-26 18:06:15 +01:00
Enno Rehling
e511bf76b5 read game configuration data from .ini file 2017-01-26 18:05:26 +01:00
Enno Rehling
b51349df6b change error message categories. 
also removing some unused messages and code that supports them.
https://bugs.eressea.de/view.php?id=2270
 2017-01-26 18:05:26 +01:00
Enno Rehling
6d5749308d rename [eressea] section to [game] 2017-01-26 18:05:26 +01:00
Enno Rehling
437d959d97 do not set -Werror twice 2017-01-26 18:05:26 +01:00
Enno Rehling
1921fa4ec1 issue #478: re-enable -Werror 2017-01-26 18:05:26 +01:00
Enno Rehling
94737375f5 issue #621: delete battledebug code 2017-01-26 18:05:26 +01:00
Enno Rehling
d1b5daf833 compiles with gcc on rpi 2017-01-26 18:05:26 +01:00
Enno Rehling
7b25ed282d more stbool.h includes, MSVC has no unlink 2017-01-26 18:05:26 +01:00
Enno Rehling
774fa12a5a continued work for MSVC compilation 2017-01-26 18:05:25 +01:00
Enno Rehling
5ddd511aa8 continue fixing compilation (gcc/clang) 2017-01-26 18:03:48 +01:00
Enno Rehling
d94cde67a4 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
Enno Rehling
ae3bfc952b create_order takes variable arguments! 
more snprintf removal.
 2017-01-26 17:57:22 +01:00
Enno Rehling
03def6ae5e replace snprintf and the like. 
you cannot trust _snprintf in MSVC (no zero-termination).
 2017-01-26 17:57:21 +01:00
Enno Rehling
fd759e7ff6 remove old & unused fix_famililar repair code. 2017-01-26 17:57:21 +01:00
Enno Rehling
9351a1960e gcc warning eliminated 2017-01-26 17:57:21 +01:00
Enno Rehling
2422e63af2 never use strncpy, anywhere. 2017-01-26 17:57:21 +01:00
Enno Rehling
d71d5e413a eliminate unnecessary strncpy use. 2017-01-26 17:57:21 +01:00
Enno Rehling
47c8b20f68 add a happy test for mt_new. 
refactor to not use strncpy.
 2017-01-26 17:57:21 +01:00
Enno Rehling
b8bccd7238 monster name pluralization changes with u->number. 2017-01-26 17:57:21 +01:00
Enno Rehling
e49d350348 test that monsters with "namegeneric" hook get a NULL name (WIP) 2017-01-26 17:57:21 +01:00
Enno Rehling
51bebfdb6b fix undead name generation. 2017-01-26 17:57:21 +01:00
Enno Rehling
0c865dca57 failing test for name_unit. 2017-01-26 17:57:21 +01:00
Enno Rehling
8c045d7a78 fix flt/int compilation bug. 2017-01-26 17:57:21 +01:00
Enno Rehling
f297d89958 merge monster.c and monsters.c 
move RCF_DESERT handling to monsters.c
 2017-01-26 17:57:21 +01:00
Enno Rehling
129f6fb68a fix bug 2266 2017-01-26 17:57:21 +01:00
Enno Rehling
13128be0aa add a failing test for bug 2266 2017-01-26 17:57:21 +01:00
Enno Rehling
5cb67e1da0 start writing a test (WIP). 2017-01-26 17:57:21 +01:00
Enno Rehling
70dfe20e62 small edit (int->bool) 2017-01-26 17:57:21 +01:00
Enno Rehling
61f3585ad7 unlimited teachers. 
quicklist replaces fixed array.
 2017-01-26 17:57:21 +01:00
Enno Rehling
d42f1767ff add a test for teach-messages. 
vheck that they are generated for students and teachers.
 2017-01-26 17:57:21 +01:00
Enno Rehling
a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling
2ace44d385 fix duplicate cutest library conflict and crash 2017-01-26 16:05:44 +01:00
Enno Rehling
c72b050a42 WIP: quicklist->selist shim can compile and link, but tests crash 2017-01-26 10:53:52 +01:00
Enno Rehling
1382583109 fix compilation (but not linking). 2017-01-26 10:15:26 +01:00
Enno Rehling
d9213c8f25 WIP: still converting to clibs/selist 2017-01-26 10:12:12 +01:00
Enno Rehling
955997d58c WIP: use latest clibs with selist. 
adding a transitional quicklist.c module to reduce work.
 2017-01-26 06:00:08 +01:00
Enno Rehling
30fc6f3e91 BESCHREIBE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-25 21:03:08 +01:00
Enno Rehling
77cbd04cfa BENENNE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-25 20:57:54 +01:00
Enno Rehling
b170a30faa add a function to compare size of occupied castles 2017-01-25 18:17:19 +01:00
Enno Rehling
99274e3ab1 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-23 21:35:01 +01:00
Enno Rehling
6d9d920f81 fix issue #477 (intermittent volcano) 2017-01-23 11:45:05 +01:00
Enno Rehling
646e6f7197 refactor and annotate volcano outbreaks. 
add configuration options to control volcano behavior.
 2017-01-23 11:21:48 +01:00
Enno Rehling
e19f0ad381 issue #633: parse FACTION/PARTEI in any language. 
added a test since the first fix did not work.
 2017-01-23 10:47:49 +01:00
Enno Rehling
23d1355fa1 FACTION and PARTEI should both start orders. 2017-01-23 09:22:29 +01:00
Enno Rehling
30665f874a fix game_name, remove it from rules 2017-01-22 20:32:54 +01:00
Enno Rehling
9ccaab6516 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-22 20:19:32 +01:00
Enno Rehling
f09259f2b3 eliminate duplicate password message 2017-01-22 18:51:20 +01:00
Enno Rehling
4cbeb03590 clean the quipment interface for lua a little bit. 2017-01-22 18:35:54 +01:00
Enno Rehling
0270b3fb8a rename create_equipment function 2017-01-22 18:28:04 +01:00
Enno Rehling
09d4316568 missing includE 2017-01-22 18:03:46 +01:00
Enno Rehling
9e9cd6ae79 try loading config.lua and custom.lua files, if they exist. 2017-01-22 18:01:09 +01:00
Enno Rehling
baa210d1a9 Revert "remove sqlite3 code and dependency" 
This reverts commit 7b55a57610.
 2017-01-22 12:57:25 +01:00
Enno Rehling
7b55a57610 remove sqlite3 code and dependency 2017-01-22 12:51:32 +01:00
Enno Rehling
2c6ae9baef remove ERESSEA keyword from "bad password" message. 2017-01-22 12:43:48 +01:00
Enno Rehling
1c7f3fab44 emit a password message for newbie factions 2017-01-22 12:38:41 +01:00
Enno Rehling
d29fd96f59 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-22 08:05:19 +01:00
Enno Rehling
cacb450567 game.start in eressea.ini overrides calendar 2017-01-22 05:18:32 +01:00
Enno Rehling
1a20d6e5c6 use FACTION in text template, not ERESSEA 2017-01-22 04:55:19 +01:00
Enno Rehling
446e58c383 use the email address from eressea.ini in CR mailto 2017-01-22 04:46:36 +01:00
Enno Rehling
f18f083922 config.json settings shall not override eressea.ini 2017-01-21 20:59:16 +01:00
Enno Rehling
8c4cccbc65 fix valgrind error. 
I did not understand what keys look like, then effed up when fixing that.
 2017-01-21 20:51:08 +01:00
Enno Rehling
75a97c2977 fix gcc build, introduce a hard limit on ini section size 2017-01-21 20:39:46 +01:00
Enno Rehling
ebbe4fa4ac issue #629: fix eressea.ini config 
fixed reading of ini data into config (keys have a . here, not a :).
added a test.
removed obsolete global.inifile variable.
 2017-01-21 19:53:47 +01:00
Enno Rehling
23e0943baa read game configuration data from .ini file 2017-01-21 18:54:08 +01:00
Enno Rehling
9c69963477 change error message categories. 
also removing some unused messages and code that supports them.
https://bugs.eressea.de/view.php?id=2270
 2017-01-20 22:39:38 +01:00
Enno Rehling
1b2bfc7995 rename [eressea] section to [game] 2017-01-20 19:43:53 +01:00
Enno Rehling
d73c760949 do not set -Werror twice 2017-01-11 15:09:02 +01:00
Enno Rehling
d8e6e80b03 issue #478: re-enable -Werror 2017-01-11 14:55:03 +01:00
Enno Rehling
a4d8d36aec issue #621: delete battledebug code 2017-01-11 14:53:35 +01:00
Enno Rehling
05b6c1c418 Merge branch 'develop' into c99 2017-01-11 09:30:50 +01:00
Enno Rehling
f8ff9ffda5 compiles with gcc on rpi 2017-01-10 18:40:01 +01:00
Enno Rehling
ba2f35e44f more stbool.h includes, MSVC has no unlink 2017-01-10 18:20:47 +01:00