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

153 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
2ee0e599b1 initialize game after loading config 2017-02-11 17:38: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
94fcef2fac the locales module is deprecated. 
let's do this in custom.lua from now on.
 2017-01-22 19:32:03 +01:00
Enno Rehling
8d4a83d1b4 make these modules optional 2017-01-22 11:38:01 +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
31b3f2b2de remove Umlaut from Lua script 2016-12-10 16:22:57 +01:00
Enno Rehling
5a129f8bd4 Create the snowman with full hitpoints. 
https://bugs.eressea.de/view.php?id=2239
 2016-10-02 11:42:31 +02:00
Enno Rehling
452614307d require at least 2K peasants in starting regions 2016-09-11 21:27:46 +02:00
Enno Rehling
2294de44c2 accidental duplicate close. 2016-09-11 20:14:19 +02:00
Enno Rehling
f926d89929 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 20:10:01 +02:00
Enno Rehling
fdb5ecc68b always call close() in lua when you're done with a file. 2016-09-11 19:32:54 +02:00
Enno Rehling
c21ecba8dd always call close() in lua when you're done with a file. 2016-09-11 19:28:25 +02:00
Enno Rehling
544af40981 fix seeding new factions 2016-09-08 20:34:25 +02:00
Enno Rehling
6aebb12fd5 Fix duplicate market effect. 
https://bugs.eressea.de/view.php?id=2225
The Lua markets module is wrong, so the C code is being used.
Disable the Lua module for now, either fix or delete it later?
 2016-08-06 21:51:31 +02:00
Enno Rehling
3ea33c6895 repair magic item: stardust 
https://bugs.eressea.de/view.php?id=2226
 2016-08-06 18:16:50 +02:00
Enno Rehling
eb57473af5 slightly relax limits on quality for new player regions 2016-07-30 22:01:24 +02:00
Enno Rehling
f2c02232cd http://bugs.eressea.de/view.php?id=2207 
check that there are any regions that we can seed new factions into
don't run into endless loop
 2016-07-30 22:01:10 +02:00
Enno Rehling
b5a84f07ba release version 3.8.11 
- disable autoseed (endless loop)
 2016-05-17 15:46:14 +02:00
Enno Rehling
21ee84dc65 autoseed barfs on blank lines, catch that case 2016-05-15 10:35:23 +02:00
Enno Rehling
65a163b4d9 do not seed new factions if there isn't a minimum number of them 2016-05-05 13:51:31 +02:00
Enno Rehling
b6b452c77b Make this error a warning instead, Eternath is over. 
Disable Eternath in E2.
 2016-01-24 11:07:07 +01:00
Enno Rehling
c2e837e826 deprecated module, turn error into warning 2016-01-21 12:34:55 +01:00
Enno Rehling
4f7b274bf6 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	src/buildno.h
 2016-01-01 16:38:57 +01:00
Enno Rehling
4952f212b8 snowglobe error messages. todo: testing (how?) 2015-12-31 14:43:38 +01:00
Enno Rehling
e1f3b3cdcf passing order object into lua use-functions, so we can use them in error messages. 2015-12-30 21:20:59 +01:00
Enno Rehling
2aafb841a5 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
 2015-12-26 14:46:20 +01:00
Enno Rehling
b66b6f7f4c testing christmas items, removing old xmas scripts 2015-12-22 19:33:44 +01:00
Enno Rehling
cf90f8cf93 it's beginning to look a lot like christmas 
Conflicts:
	scripts/eressea/xmas.lua
 2015-12-22 18:46:57 +01:00
Enno Rehling
80e0707cb2 snowglobe transformations for several trerrains. messages still TBD 2015-12-22 18:46:45 +01:00
Enno Rehling
3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD 
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
 2015-12-22 18:46:42 +01:00
Enno Rehling
810ad094af suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels 2015-12-18 15:13:15 +01:00
Enno Rehling
78c13d3ca2 bugfix dupe message 
http://bugs.eressea.de/view.php?id=2178
 2015-12-12 21:34:56 +01:00
Enno Rehling
02c249d61e fix not giving christmas trees 
https://bugs.eressea.de/view.php?id=2171
 2015-12-05 17:33:41 +01:00
Enno Rehling
097ff40823 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2015-11-26 21:13:24 +01:00
Enno Rehling
8cf62ee236 merge the various Christmas modules into one file, make them trigger on a turn, reduce spam 2015-11-26 21:13:01 +01:00
Steffen Mecke
dcca3f1424 test and fix for market operation, bug2083 
http://bugs.eressea.de/view.php?id=2083
 2015-11-16 01:13:01 +01:00
Enno Rehling
1993e5e384 Merge branch 'master' into develop 2015-11-04 09:05:04 +01:00
Enno Rehling
1c85f0e1de fix scripting bug in new autoseed module 2015-11-04 08:56:31 +01:00
Enno Rehling
5bcc0699a1 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-11-03 12:29:55 +01:00
Enno Rehling
451303d7d3 autoseed as a module for E2 
made from pieces of newplayer.lua and populate.lua
 2015-11-03 11:54:08 +01:00
Enno Rehling
47c48d2985 Merge branch 'master' into develop 2015-09-12 22:27:14 +02:00
Enno Rehling
871373a0e5 be less verbose about cursing 2015-09-12 22:26:54 +02:00
Enno Rehling
a01955e06a disable features by name that are not keywords 2015-09-12 17:37:29 +02:00
Enno Rehling
b33babd316 fix cursed factions (broke it during bit32 changes) 2015-09-06 13:20:37 +02:00
Enno Rehling
552f32ff97 bugfix https://bugs.eressea.de/view.php?id=2133 
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
 2015-09-04 14:39:44 +02:00
Enno Rehling
f0a9cc8233 added a lua module that marks factions as cursed 2015-08-31 12:50:58 +02:00
Enno Rehling
4d061d8592 repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
Enno Rehling
b53d01eb18 Bug 1890: monsters do not respect the rules when giving excess weight to peasants. 
https://bugs.eressea.de/view.php?id=1890
fixed by creating a give order instead of calling give_item directly.
 2015-07-02 11:08:38 +02:00
Enno Rehling
15e9c5962c merge feature/test-cleanup 
removing old test files
merging old tests into current system
fixing some internal bugs (i.e. adjust_coordinates)
 2015-07-01 21:24:44 +02:00
Enno Rehling
b8de887399 change log level from warn->info 2015-05-24 16:21:12 +02:00
Enno Rehling
59400b1e27 Merge branch 'release-3-5' into develop 
Conflicts:
	s/runtests
	src/buildno.h
 2015-05-24 14:10:42 +02:00
Enno Rehling
e9992db51c fix pool test (GiveRestriction broke it). 
- do not default to loading the E2 rules for tests, so GiveRestriction
will not be set to a default value.
- only load configuration if a ruleset has been defined.
 2015-05-24 09:09:34 +02:00
Enno Rehling
e99db198eb bugfix use_item (use_skillpotion did not use pool). 
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
 2015-05-24 07:17:23 +02:00
Enno Rehling
657c621582 if the game has no region named Muschelplateau, then ignore this code 2015-05-20 13:05:47 +02:00
Enno Rehling
177d1c701f Merge branch 'lua-test-framework' of https://github.com/badgerman/eressea into badgerman-lua-test-framework 
Conflicts:
	src/kernel/region.c
	src/util/log.h
 2015-05-17 17:39:10 +02:00
Enno Rehling
168fa02e68 for reasons, sometimes libxml2 is not compile, and all tests will fail. detect that. 2015-04-06 17:49:40 +02:00
Enno Rehling
4fb0c133e8 enable json reports for develop branch 2015-04-05 12:50:10 +02:00
Enno Rehling
d8c1f03f55 new module to enable jsreport for selected factions. 2015-04-04 09:19:10 +02:00
Enno Rehling
02e43d2772 fix a crash in the ancient wedding code? 2015-03-06 22:38:27 +01:00
Enno Rehling
4eed731b8f repair bad ents, do not create them as undead. 2015-02-19 17:30:13 +01:00
CTD
ac3195851a Erstmal nur der Burgenbonus 
Das mit der Größe kommt noch mal extra, der Übersicht wegen.
Sinvoller weise kann man den Bonus jetzt in der castle.xml einstellen.
Mit neuen Defaultwerten in den XML Dateien.
 2015-01-09 15:53:14 +01:00
Enno Rehling
14b1a164ed when tests are modifying important global state, they should reset it in teardown. 
TODO: actually, they probably should not modify state in the first place.
 2015-01-03 16:11:33 +01:00
Enno Rehling
880b965c54 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-12-28 17:29:34 +01:00
Enno Rehling
df3ce116a7 limit eternath gates to 1-person units, avoid crash 2014-12-27 23:51:48 +01:00
Enno Rehling
9ac90dd6a5 bugfix: USE snowman did not check that the unit actually owned a snowman, causing a unit to have negative snowmen in turn 629 (exploit). 2014-12-13 23:20:10 +01:00
Enno Rehling
9c6b7af27f fix a bug in the eternath quest gates (re-running old turn sometimes needs this). 2014-12-11 09:15:19 +01:00
Enno Rehling
7b2d1991d8 add missing file, fix factions that lack a locale. 2014-11-23 21:15:09 +01:00
Enno Rehling
49493fa630 fix typo in last commit. 
package is a standard lua module, not a good variable name.
log name of script.
 2014-11-06 07:53:15 +01:00
Enno Rehling
143fab9653 Some changes after talking to Don. 
moved locale change into its own module.
made monsters get a report by default.
reoved old creation.c code, it was dead.
 2014-11-06 07:15:53 +01:00
Enno Rehling
93e20ac7a9 clean up data files after tests are finished. 2014-11-04 08:06:46 +01:00
Enno Rehling
6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling
f9c5d58f41 read json config file if available. 
missed an include, broke the build.
 2014-10-29 08:30:07 +01:00
Enno Rehling
91ec503b43 fix the mapper script. 
1. move xml configuration reading to a separate module, it's compliated.
2. move the map file to the main scripts folder.
 2014-08-12 22:54:55 +02:00
Enno Rehling
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
Enno Rehling
130f6401b7 No christmas trees in E4 
- Bugfix for http://bugs.eressea.de/view.php?id=2019
- removing some old tests
 2014-08-10 23:07:25 +02:00
Enno Rehling
91eead0993 fix test runner 2014-08-07 13:23:11 +02:00
Enno Rehling
7348ce698b add config.path parsing to a module of its own. 2014-08-06 23:47:16 +02:00
Enno Rehling
71056cc2e5 in Lua 5.2, table.getn no longer exists 2014-08-03 20:51:22 +02:00
Enno Rehling
ebe078df61 replace backslash with forward for unix-style paths 2014-08-03 12:43:16 +02:00
Enno Rehling
9cb0deb4f9 Eressea tests, rewritten 2014-08-02 23:17:55 +02:00
Enno Rehling
44c89e26ec Lua module rewrite, part deux. 
rules for E3 and E4
some missing files.
 2014-07-26 23:41:56 +02:00
Enno Rehling
d9457a2488 rewrite of the Lua module system. 
At this time, only E2 is working.
Fixing a lot of old code (monster is no longer id 0).
package.paths configured from eressea.ini
install directory configured from eressea.ini
moving building_action into a seaprate module (it's deprecated)
 2014-07-26 22:52:25 +02:00
Enno Rehling
30e9565ae6 update config files to use game.rules from eressea.ini. 
ToDo: set rules from command line with -r
 2014-07-23 12:19:24 +02:00
Enno Rehling
7b86db29d7 Fixing some last holdouts from the eressea->core rename. 2013-12-30 09:29:18 +01:00
Enno Rehling
ba328d913e math.mod is deprecated 2012-07-10 09:22:51 +02:00
Enno Rehling
3f2e46c008 use new eressea module functions 2012-06-17 02:54:05 +02:00
Enno Rehling
10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling
2bbcfa7e0c test this spell 2012-05-25 19:55:03 -07:00
Enno Rehling
97919c6a25 remove debug output 2012-05-19 18:49:52 -07:00
Enno Rehling
635ee6a99e trying to figure out why some run_tests tests are not working 2012-05-20 03:21:19 +02:00
Enno Rehling
e6ccccf054 * move the bson tests 
* include the spells tests
 2011-02-19 06:17:08 -08:00
Enno Rehling
2073e8f860 http://bugs.eressea.de/view.php?id=1816 
repair snowmen (xmas 2004)
 2010-11-20 18:01:46 -08:00
Enno Rehling
6773747f93 bring script up to date with current syntax. 2010-10-23 01:12:23 -07:00
Enno
02b89b7d50 feature was meant for e3a, not eressea 2010-09-12 04:12:04 +02:00
Enno Rehling
be2d7d203d frost module: during winter, some oceans freeze over 2010-09-11 18:48:08 -07:00
Enno Rehling
320bcb2121 http://bugs.eressea.de/view.php?id=1796 
great bows should be allowed for all, not just elves
 2010-08-17 23:34:50 -07:00
Enno
7aa0e85917 small fixes to directories and hings 2010-08-08 11:28:43 +02:00
Enno
0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00
Enno Rehling
f8094f77dc use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-07 22:53:41 -07:00