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

2887 commits

Author SHA1 Message Date
Enno Rehling
4d07782e7d Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
 2017-03-06 06:27:31 +01:00
Enno Rehling
33b98b59ec when make_frac cannot find a gcd, cheat. 2017-03-05 22:28:08 +01:00
Enno Rehling
e233ed4344 eliminate source of randomness from test 2017-03-05 19:23:47 +01:00
Enno Rehling
5c1fb83c47 Merge branch 'hotfix/names' of https://github.com/ennorehling/eressea.git 2017-03-05 18:57:35 +01:00
Enno Rehling
cdb65dfd36 Turns out: We did not have a singular form of sapling. 2017-03-05 18:57:28 +01:00
Enno Rehling
dbe5980577 CR is missing saplings? 2017-03-05 18:47:49 +01:00
Enno Rehling
f699c32f0e BUG 2298: fix NR display. 
always use correct singular or plural form.
 2017-03-05 18:25:15 +01:00
Enno Rehling
8d7f966391 BUG 2298: fix CR output. 
always use the plural form.
 2017-03-05 18:23:24 +01:00
Enno Rehling
0379a17350 make report_resource return an rtype, not a name. 2017-03-05 17:42:57 +01:00
Enno Rehling
d6ce1d9cfe Add a test for singular resources. 2017-03-05 17:26:00 +01:00
Enno Rehling
52dd11a28f create a failing test for stones in the NR. 2017-03-05 17:18:17 +01:00
Enno Rehling
45862a06d0 Add a good test for the NR. 
TODO: make it fail.
 2017-03-05 16:55:11 +01:00
Enno Rehling
83f170541b short unit-test for resources in the CR. 
now complains because Bauern!=Bauer.
TODO: crtag is shit.
 2017-03-05 15:51:04 +01:00
Enno Rehling
6a87625409 refactor cr_output_resources for easy testing. 
Write a (failing) test that checks first resource is silver.
 2017-03-05 15:26:04 +01:00
Enno Rehling
aa662e65d2 eliminate R_PERSON hack. 2017-03-05 13:58:11 +01:00
Enno Rehling
5675ef6091 clean and extend the enum of resources. 2017-03-05 11:10:59 +01:00
Enno Rehling
caa8159428 eliminate duplicate string definition 2017-03-05 09:52:17 +01:00
Enno Rehling
acfb666539 remove rtype->uget funpointer, and lua callbacks. 
fix a missing lua_pop that trashed the heap.
 2017-03-04 20:59:43 +01:00
Enno Rehling
50bdc71c1b kill lua_canuse_item and itype->canuse 2017-03-04 17:27:13 +01:00
Enno Rehling
d9d542cfee we only call these when target is 0, anyway. 2017-03-03 19:19:33 +01:00
Enno Rehling
d976ee6f67 special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +01:00
Enno Rehling
a265bc9cdb test giving stuff to 0. 2017-03-03 18:03:34 +01:00
Enno Rehling
5b1e786fb2 fix bad strtok call 2017-03-03 10:35:34 +01:00
Enno Rehling
6e8e163099 make item allow/deny XML easier to read, fix code 2017-03-03 09:56:27 +01:00
Enno Rehling
b0baba4405 bug 2290: sawmill bonus was broken. 
not pleased with the test, which is in lua only.
https://bugs.eressea.de/view.php?id=2290
 2017-03-02 19:21:11 +01:00
Enno Rehling
4502141c5b bug 2292: set mailcmd from eressea.ini 
this fixes https://bugs.eressea.de/view.php?id=2292
 2017-03-02 18:28:00 +01:00
Enno Rehling
45854851ae bug 2292: allow packice to be guarded again. 
https://bugs.eressea.de/view.php?id=2292
 2017-03-02 18:08:58 +01:00
Enno Rehling
326f543ece gcc reports unused variable. 
and for once, that points to a bug!
 2017-03-02 13:01:27 +01:00
Enno Rehling
3cb24299fa bug 2292: only land regions can be guarded. 
https://bugs.eressea.de/view.php?id=2292
Also adding tests for every other failure reason.
 2017-03-02 12:39:21 +01:00
Enno Rehling
912a8b5412 bug 2291: json settings must not override eressea.ini. 
https://bugs.eressea.de/view.php?id=2291
 2017-03-01 21:17:37 +01:00
Enno Rehling
7f03417c37 bug 2286: fix missing addresses. 
was using cansee_unit wrong, mixed up traveler (ut) and target (u).
 2017-03-01 21:10:50 +01:00
Enno Rehling
98447668ca fix bad tests, upgrade clibs. 2017-03-01 20:37:49 +01:00
Enno Rehling
83a862d557 add a failing test for bug 2286 2017-03-01 19:54:52 +01:00
Enno Rehling
e0085eac0c write a test for get_addresses before modifying it. 2017-03-01 19:52:23 +01:00
Enno Rehling
295614643a more factionstealth testing. 2017-03-01 19:18:00 +01:00
Enno Rehling
6d9387f6c2 warn about unused variables, back on 2017-03-01 18:16:07 +01:00
Enno Rehling
fc8e6dc6de TARNE PARTEI creport test 2017-03-01 18:11:46 +01:00
Enno Rehling
e2e602e7ba fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00
Enno Rehling
2eb88c472c have I bollocksed up the deny/allow rules? looks like it 2017-02-28 14:22:59 +01:00
Enno Rehling
c276b5a43c generate error, not crash. 
todo: fix items
 2017-02-28 14:22:59 +01:00
Enno Rehling
5a01eae522 make item_use function crash if new and old rules do not agree 
add a 'test' function to E3 that exercises all those items
 2017-02-28 14:22:59 +01:00
Enno Rehling
69e28034b4 Kill unused "magicboost" function. 
I have no idea why this exists.
 2017-02-27 21:00:15 +01:00
Enno Rehling
49d8a03eca remote the item_type.use funpointer. 2017-02-27 20:41:05 +01:00
Enno Rehling
9e239c88f4 testing insect warmth potion 2017-02-27 20:26:48 +01:00
Enno Rehling
462d0118e3 better testing for some items. 2017-02-27 20:16:50 +01:00
Enno Rehling
9d09574d5e enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-02-27 19:35:14 +01:00
Enno Rehling
1b93c14806 Test E2 items in E2 only. 
Remove eye of demon (broken item).
 2017-02-27 18:50:48 +01:00
Enno Rehling
1a0992e37b remove remainders of the arena. 
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
 2017-02-27 18:21:41 +01:00
Enno Rehling
108501e398 tests for more items 2017-02-27 15:14:52 +01:00
Enno Rehling
3d4860c033 remove more of the artrewards 2017-02-27 14:19:25 +01:00
Enno Rehling
db0cbf34c7 test for aurapotion 2017-02-27 14:17:38 +01:00
Enno Rehling
5ffe60193b move items with tests to items.c 2017-02-27 14:10:12 +01:00
Enno Rehling
60c2f1e807 test the birthday amulet 2017-02-27 14:01:41 +01:00
Enno Rehling
604b574d0f fix potion-use? need more testing 2017-02-27 11:39:55 +01:00
Enno Rehling
715c8569ba hacked the item-use function, 
XML needs cleaning up, funpointer needs to die
 2017-02-27 09:48:28 +01:00
Enno Rehling
44c3838d79 WIP: itype->use elimination. 2017-02-27 04:22:28 +01:00
Enno Rehling
132ac0a38a Merge remote-tracking branch 'upstream/develop' into develop 2017-02-26 20:23:25 +01:00
Enno Rehling
b8d9fae4e4 begin version 3.12 2017-02-26 20:16:22 +01:00
Enno Rehling
b8ffc20d87 remove item_useonother callbacks (use is fine). 
add a test for foolpotion.
 2017-02-26 19:54:58 +01:00
Enno Rehling
3c60f863a5 remove the special_resources trie. 
memory leak, bad performance.
 2017-02-26 18:17:58 +01:00
Enno Rehling
56eb1b753c fix header missing a struct 2017-02-26 15:52:58 +01:00
Enno Rehling
71e5d101a8 converter compiles fine, does nothing 2017-02-26 15:33:32 +01:00
Enno Rehling
f406c47657 use converter frm noxml branch 2017-02-26 15:30:58 +01:00
Enno Rehling
67252e2924 add conversion program 2017-02-26 15:03:47 +01:00
Enno Rehling
6e27adb892 remove pointless <resourcelimit/> wrapper from XML. 2017-02-26 14:00:20 +01:00
Enno Rehling
d4b973fea4 remove resource_limit struct indirection. 2017-02-26 13:55:19 +01:00
Enno Rehling
c3b0b9e8b3 fix missing limit-flags. 2017-02-26 13:47:22 +01:00
Enno Rehling
0738090f28 no more funpointers in resource_limit. 
change how resource limits in lua are called.
 2017-02-26 13:19:47 +01:00
Enno Rehling
84c6a4b7b5 remove last vestiges of the rm_* material names 2017-02-25 21:25:55 +01:00
Enno Rehling
6031dff685 resource_limit.value is always zero, never initialized. kill it. 2017-02-25 19:50:32 +01:00
Enno Rehling
3a985108a6 change all magic resistance to use fractions. 2017-02-24 20:47:47 +01:00
Enno Rehling
e557140ad1 more fractions functionality. 2017-02-24 20:47:31 +01:00
Enno Rehling
e0229be500 also implement subtraction. 2017-02-24 17:56:39 +01:00
Enno Rehling
234eb62226 short and sweet math with fractions. 
goinf to use this for magres.
 2017-02-24 17:51:35 +01:00
Enno Rehling
158e0646e1 implement fractions 2017-02-24 15:48:49 +01:00
Enno Rehling
25d3aacffa remove artrewards, they predate my backups 2017-02-24 14:38:08 +01:00
Enno Rehling
794dae11cf remove artsculpture and genericbuilding. 
deal with buildings having an unknown type.
 2017-02-24 14:29:14 +01:00
Enno Rehling
f06d86007c seed normalization (broken) 2017-02-23 22:08:16 +01:00
Enno Rehling
9cbd5b88e6 rm_tree is not actually a thing 2017-02-23 08:07:47 +01:00
Enno Rehling
be42137833 fix rmt_find for trees 2017-02-23 08:02:24 +01:00
Enno Rehling
f4dc88c3be strip rawmaterial_type to just the funpointers 2017-02-23 07:53:28 +01:00
Enno Rehling
1498f2e1d7 refactor rawmaterial_type. 
still have to decide if we need it at all.
 2017-02-22 21:10:22 +01:00
Enno Rehling
ce2ea95880 begin refactoring limited resources. 2017-02-22 20:28:34 +01:00
Enno Rehling
67831ad708 we like test_setup. 2017-02-22 20:16:51 +01:00
Enno Rehling
82e4d75429 unused function 2017-02-22 19:43:17 +01:00
Enno Rehling
807fe607e7 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-22 19:38:56 +01:00
Enno Rehling
3274065004 reduce complexity of building_protection. 2017-02-22 19:38:46 +01:00
Enno Rehling
deb39f6b8f test building_effsize does what it does 2017-02-22 14:27:13 +01:00
Enno Rehling
bfb5a9b692 set age_unit and name_unit funpointers in rc_create. 
no more <function/> in XML races.
rename juju-zombie => juju.
 2017-02-20 22:07:36 +01:00
Enno Rehling
a1dc3dc8e4 remove race.age from XML data (set in rc_create) 2017-02-20 21:19:58 +01:00
Enno Rehling
44f6336e1f do not register unused functions. 2017-02-20 21:04:50 +01:00
Enno Rehling
4bd295e3b2 remove the nearly unused illusion race 2017-02-20 20:42:31 +01:00
Enno Rehling
5ba3d76efb remove race.init_familiar funpointer 2017-02-20 09:32:03 +01:00
Enno Rehling
04154628e6 remove funpointer for spoils 2017-02-20 09:18:04 +01:00
Enno Rehling
59f87edbb1 remove unused race.move_allowed method 2017-02-20 09:00:48 +01:00
Enno Rehling
ba1fdcce59 remove race.describe funpointer 2017-02-20 07:47:36 +01:00
Enno Rehling
27f9490ec1 Merge pull request #661 from ennorehling/develop 
pedantic gcc compilation
 2017-02-18 22:07:12 +01:00
Enno Rehling
b8302b1f15 Merge branch 'develop' of github.com:eressea/server into develop 2017-02-18 22:03:34 +01:00
Enno Rehling
b744b6d601 Merge branch 'master' into develop 2017-02-18 22:02:58 +01:00
Enno Rehling
5796f60f16 spells will always resist magic 2017-02-18 22:00:48 +01:00
Enno Rehling
9e14bf5cf9 clang complains about -ansi? 2017-02-18 21:26:38 +01:00
Enno Rehling
12b1dcaa38 remove platform-cruft 2017-02-18 21:23:24 +01:00
Enno Rehling
4e5f1d05ce Be very strict about C standards. 
Compile with -std=c89 in gcc.
remove all // comments (they are nice, but unnecessary).
variables only declared at start of block.
various pedantery.
backwards compatible va_copy for pre-C99 gcc.
 2017-02-18 21:15:14 +01:00
Enno Rehling
5b52451d9d remove unused ai.aggression atribute 2017-02-18 19:21:54 +01:00
Enno Rehling
a553b2258a remove code for shadowcall, too 2017-02-18 18:25:58 +01:00
Enno Rehling
daa7554361 remove race.precombatspell 2017-02-18 18:14:18 +01:00
Enno Rehling
a754975ef9 fix loading data where embassy uses floats. 2017-02-18 17:52:25 +01:00
Enno Rehling
9682d6b48c implement quick-and-dirty gcd 2017-02-18 15:45:57 +01:00
Enno Rehling
aee68fbd0f github issue #658 
MACHE 1 EISEN use 1 iron even with savings.
 2017-02-18 11:19:42 +01:00
Enno Rehling
0a3e3de5a3 refactor fractions a little bit. 2017-02-17 22:01:51 +01:00
Enno Rehling
2328975dc2 do not use floats for material-save. 
abusing variants for storing short fractions.
remove unused RMF_SAVERESOURCE.
 2017-02-17 21:45:10 +01:00
Enno Rehling
a624915a06 error message if building is required. 
was broken in recent commit.
also fix reference counts.
 2017-02-16 20:26:34 +01:00
Enno Rehling
a5dfe12d48 initialize variable 2017-02-16 19:38:09 +01:00
Enno Rehling
20ff8981df trying to extract allocation modifiers into a separate function 2017-02-16 10:19:59 +01:00
Enno Rehling
50083fc668 BUG 2279: too many resources used. 
diddling the resource-save formula until test passes.
 2017-02-15 21:16:54 +01:00
Enno Rehling
5902a6922f BUG 2279: add a failing unit test. 2017-02-15 20:50:45 +01:00
Enno Rehling
5680057e7f adding simple test for MAKE <ITEM> 2017-02-15 17:09:23 +01:00
Enno Rehling
7947101899 factor out some function to make future debugging easier. 2017-02-14 21:01:22 +01:00
Enno Rehling
4ce415be50 BUG 2281: fix maxsize of guard towers. 2017-02-14 20:51:03 +01:00
Enno Rehling
08e14f3095 coverity warnings 2017-02-14 16:23:40 +01:00
Enno Rehling
aa230cc191 fix coverity warnings 2017-02-14 12:15:36 +01:00
Enno Rehling
3ea12be564 BENUTZE Muschel repariert. 
at_keys hat jetzt auch zu jedem key ein value, und Funktionen zum Update altee Daten.
 2017-02-13 18:48:38 +01:00
Enno Rehling
e9ca536e8e Merge branch 'master' into develop 2017-02-12 20:08:29 +01:00
Enno Rehling
f132dfe4d4 bug 2282: Datenfile 2012 kaputt. 
make the reader for at_keys accept that sometimes, there are 0 keys.
 2017-02-12 19:57:02 +01:00
Enno Rehling
182fc3fa3c remove test for bug 2253 2017-02-12 19:32:27 +01:00
Enno Rehling
4828045fd7 there is no NEWATSROI, remove dead code 2017-02-12 18:52:41 +01:00
Enno Rehling
b05c2564e5 make att_modification not crash when a good/bad dream curse has no magician. 2017-02-12 13:22:44 +01:00
Enno Rehling
75514014bc no need to create locale here 2017-02-12 06:20:37 +01:00
Enno Rehling
ac8250ecd8 remove global read_orders binding 2017-02-12 06:14:29 +01:00
Enno Rehling
6893248473 jsonconf should not need to create locales 2017-02-12 06:06:33 +01:00
Enno Rehling
17ff2ead41 make_locales from config_get 2017-02-12 05:52:46 +01:00
Enno Rehling
e5c95f1501 avoid division by zero when no calendar is configured 2017-02-12 05:09:23 +01:00
Enno Rehling
422af9dd4d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-11 22:29:02 +01:00
Enno Rehling
f6fcd39293 add a failing test for familiars (disabled). 
remove superfluous init_locales calls.
 2017-02-11 22:28:57 +01:00
Enno Rehling
40de740a0a remove dict from ships and buildings, too 2017-02-11 22:24:36 +01:00
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