Commit graph

1316 commits

Author SHA1 Message Date
Enno Rehling
89d50e9b72 fix compile, wrong data version. 2017-08-18 21:05:26 +02:00
Enno Rehling
e2578966e5 fix bad data caused by bug 2356 2017-08-18 21:02:23 +02:00
Enno Rehling
d13cd0d0df Merge pull request from ennorehling/master
BUG 2357: new players must be able to recruit
2017-08-18 20:26:23 +02:00
Enno Rehling
aa61860996 BUG 2357: make sure starting regions have enough recruits 2017-08-18 20:20:12 +02:00
Enno Rehling
c8b2ce7900 BUG 2356: fix curse read/write
rename curse::flags to curse::mask, use c_flags.
fix some curse_type having CURSE_ISNEW fixed.
2017-08-18 19:39:33 +02:00
Enno Rehling
293cb78de8 BUG 2356: add a failing test. 2017-08-18 19:36:17 +02:00
Enno Rehling
4675cf1d05 allow config to override first unit equipment 2017-07-30 14:05:33 +02:00
Enno Rehling
75ae22e5b6 BUG 2340: endloser Sturmelementar
CURSE_NOAGE is a weird thing.
2017-06-18 21:48:47 +02:00
Enno Rehling
8178f3f1e6 BUG 2334: Nochmal Ponnuki
Monsters cannot attack or guard when they are fleeing
2017-06-18 14:20:01 +02:00
Enno Rehling
3ec1476da2 improve the mailcmd test 2017-06-11 17:13:31 +02:00
Enno Rehling
f6ba5b6a53 BUG 2333 NMR-Anzahl im WB falsch
https://bugs.eressea.de/view.php?id=2333
2017-06-11 17:06:13 +02:00
Enno Rehling
a3f655f322 fix bogus warnings 2017-05-22 21:35:25 +02:00
Enno Rehling
1bc23beccc remove btypr->name funcptr and btype->attribs.
why weren't these already gone?
2017-05-12 22:12:22 +02:00
Enno Rehling
11d9afc62e BUG 2322: Test and bugfix for castle names. 2017-05-12 22:05:14 +02:00
Enno Rehling
c7f8b16c07 remove unused r->land->items list. 2017-05-09 18:49:10 +02:00
Enno Rehling
6b7dcadf84 refactor resource callbacks into callbacks module 2017-05-09 08:18:20 +02:00
Enno Rehling
d9fca4dcb3 refactor stray fptr variable into callbacks module. 2017-05-08 22:44:18 +02:00
Enno Rehling
18defdd5a2 remove last pieces of calendar.xml 2017-05-08 06:57:03 +02:00
Enno Rehling
8765204e00 add unit tests for calendar parsing. 2017-05-07 18:10:18 +02:00
Enno Rehling
7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling
bf935f5bb7 gamedate: no negative turns allowed.
feed the beast assert.
2017-05-07 16:12:10 +02:00
Enno Rehling
2e3f68ed87 add a config_set_int convenience function. 2017-05-07 13:26:54 +02:00
Enno Rehling
898c12e99a XML construction elements never have a building.
required buildings are encoded by RMT_PROD_REQUIRE.
improved error messaging.
2017-05-06 15:53:21 +02:00
Enno Rehling
b74d18b8c9 bt_register is non-standard API, hide it.
factor out st_register for readability.
2017-05-06 15:39:09 +02:00
Enno Rehling
3eb89e93ae use a cbtrie for shiptype-lookups instead of the selist. 2017-05-06 15:33:35 +02:00
Enno Rehling
6778cbe483 assert that we do not add new ship types after the per-language lookup is initialized. 2017-05-06 15:26:45 +02:00
Enno Rehling
dd4bdca72b do not use the shiptypes list for searches, use a cbtrie. 2017-05-06 15:05:36 +02:00
Enno Rehling
cb0cd87f23 fix callbacks linkage for clang/mac 2017-05-02 15:10:43 +02:00
Enno Rehling
5d710fa79f merge spell callback changes. 2017-05-01 19:13:40 +02:00
Enno Rehling
fa7a3e246b eliminate spell->id.
clean up some spell functions used by more than one spell.
2017-05-01 17:04:28 +02:00
Enno Rehling
22c05963fd fix illusioncastle reporting. 2017-05-01 14:49:06 +02:00
Enno Rehling
80d696d02a remove the funcpointer from struct spell. 2017-04-30 22:15:18 +02:00
Enno Rehling
724a41ac85 refactor: pass function name to callback, calculate it in call_spell instead. 2017-04-30 21:38:44 +02:00
Enno Rehling
edd3b36a9f add a callbacks module.
make last-chance spell function in lua for spells with none.
2017-04-30 21:38:44 +02:00
Enno Rehling
74673f172f test for raindance/harvest spells, both games 2017-04-30 21:38:30 +02:00
Enno Rehling
11bcfc2867 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-30 17:26:02 +02:00
Enno Rehling
294b7bf01e route all casting through a single cast_spell function. 2017-04-30 10:00:29 +02:00
Enno Rehling
3052628251 broaden the fumbe-lookup tests a bit, make sure prefixes don't match. 2017-04-30 04:28:07 +02:00
Enno Rehling
e5f898ce87 bugfix: portals crash buildingtype().
only type that has no construction.
2017-04-30 03:42:39 +02:00
Enno Rehling
e6f8c943fa refactor the special fumble functions for spells.
removed from struct spell.
funpointers in structs are bad, mkay.
2017-04-30 03:27:28 +02:00
Enno Rehling
7a289ceb86 simplify building_taxes, eliminate dead lua callbacks. 2017-04-29 19:21:48 +02:00
Enno Rehling
3b9a6e45a1 turns out: btype->age is never used. 2017-04-29 13:53:28 +02:00
Enno Rehling
8928c9d3cf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-29 13:37:45 +02:00
Enno Rehling
3f8de76b9d fix largestbuilding, broken in prev commit. 2017-04-29 13:37:34 +02:00
Enno Rehling
dee10e8d0d remove suspicious disabled code 2017-04-28 21:58:27 +02:00
Enno Rehling
bdc7457a08 additional testing for largestbuilding and comparisons. 2017-04-28 21:30:05 +02:00
Enno Rehling
1112890293 use building_taxes everywhere.
make it return an integer, not double.
2017-04-28 20:10:20 +02:00
Enno Rehling
16267c447e extract taxes into separate function (WIP) 2017-04-27 19:08:10 +02:00
Enno Rehling
a313e78de5 move building names from function to construction data. 2017-04-26 21:44:24 +02:00
Enno Rehling
055fdceff9 fix gcc build 2017-04-17 20:45:01 +02:00