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

1424 commits

Author SHA1 Message Date
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
69ef2c7ce7 Merge branch 'master' into develop 
Conflicts:
	src/magic.c
 2017-06-18 01:11:40 +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
3e0bc4f26d cannot assert that free_unit has no faction (complicated reasons) 2017-06-04 14:35:15 +02:00
Enno Rehling
728f7ed389 Revert "fix some failing tests." 
This reverts commit 8c11cb676f.
 2017-06-04 14:33:13 +02:00
Enno Rehling
8c11cb676f fix some failing tests. 2017-06-04 14:18:28 +02:00
Enno Rehling
5b807e2057 crash casued by spell conversion. 
remove unit from faction, not only region!
also remove spammy warning that has no value.
 2017-06-04 14:13:05 +02:00
Enno Rehling
1687e31d5f starting a new release 2017-05-28 12:51:41 +02:00
Enno Rehling
3306488641 Merge pull request #695 from ennorehling/feature/refactor-rcspell 
refactor observers, lighthouses
 2017-05-28 12:50:05 +02:00
Enno Rehling
383866c44b Merge pull request #694 from ennorehling/feature/2326-undeadhero 
BUG 2326: counting undead heroes in battle summary
 2017-05-28 12:49:46 +02:00
Enno Rehling
18daa9db2f entirely remove RC_SPELL 2017-05-24 08:52:19 +02:00
Enno Rehling
30cfe2c0c0 convert RC_SPELL to at_observer during readgame. 2017-05-24 08:18:55 +02:00
Enno Rehling
94a4e52ac8 Merge branch 'develop' into feature/refactor-rcspell 2017-05-22 21:36:02 +02:00
Enno Rehling
a3f655f322 fix bogus warnings 2017-05-22 21:35:25 +02:00
Enno Rehling
abb7c9fb17 Merge branch 'kill-rcspell' into feature/refactor-rcspell 
Conflicts:
	src/kernel/config.h
	src/main.c
	src/report.c
	src/reports.c
	src/reports.test.c
	src/spells.c
 2017-05-21 21:33:29 +02:00
Enno Rehling
58d9aa58a0 BUG 2326: Untote Helden fehlen in der Kampfübersicht 
https://bugs.eressea.de/view.php?id=2326
 2017-05-21 11:14:16 +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
Enno Rehling
635ec6d6c6 Fix a crash in TARNE <race> 
this was complicated to test, and I had to rewrite how races and their names are registered by test_create_locale.
 2017-04-17 20:11:44 +02:00
Enno Rehling
51c2df62ca fixing new coverity scan defects 
167039 Dereference after null check
167038 Unchecked return value
 2017-04-16 15:52:34 +02:00
Enno Rehling
aeeb13bb53 BUG 2318: Go, Ponnuki, Go! 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:35:55 +02:00
Enno Rehling
c6a8a76e31 strip skillmod down to the essentials. 2017-04-02 20:17:39 +02:00
Enno Rehling
d7f69dfa27 enum type clarification 2017-04-02 19:21:37 +02:00
Enno Rehling
e72155a563 WIP: reimplemented production modifiers. 
The system itself seems to work, but some Lua tests are still failing.
 2017-04-02 14:43:53 +02:00
Enno Rehling
4aa26343f6 the LOMEM define has never been used, kill it. 2017-04-01 20:08:04 +02:00
Enno Rehling
0ff9f1601c de-clutter header file. 2017-04-01 11:39:50 +02:00
Enno Rehling
967e70a4e1 SMF_RIDING is unused. 2017-04-01 11:39:41 +02:00
Enno Rehling
ed99f60186 decluttering settings.h 2017-03-31 21:37:30 +02:00
Enno Rehling
d99090ac67 remove additional unused macro constants 2017-03-31 21:29:37 +02:00
Enno Rehling
868f4e6cef also apply noerror rules to msg_feedback. 2017-03-25 11:36:29 +01:00
Enno Rehling
b44c5e54bf Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
Enno Rehling
485e8f0ce4 Revert "add failing test for skill bonus from mine, start work" 
This reverts commit ab87b1da85.
 2017-03-23 19:28:56 +01:00
Enno Rehling
ab87b1da85 add failing test for skill bonus from mine, start work 2017-03-23 18:51:30 +01:00
Enno Rehling
0c8a9354db rmt_find no longer used. 
handle old data files with rm_iron, etc.
 2017-03-22 20:46:29 +01:00
Enno Rehling
17145eaf10 make region:set_resource do the right thing 
also for adamantium
 2017-03-22 20:37:09 +01:00
Enno Rehling
4c67e0603b remove attribs from rtype (it's only in rtype->construction that we use it?) 
test to verify that mine bonus for iron works as advertised.
change the oder of arguments for faction.create (race is the only thing not optional).
 2017-03-17 22:46:10 +01:00
Enno Rehling
beb498d70c remove leftover code/data for artrewards. 2017-03-16 19:40:51 +01:00
Enno Rehling
ac12cb966d implement fixed wage functions, select by constant value 2017-03-16 16:07:52 +01:00
Enno Rehling
8d8173def3 remove the functions struct from settings (next: remove wage, too) 2017-03-13 09:30:20 +01:00
Enno Rehling
8cfcffc4aa remove data_turn and gamename from global settings. 
make run-turn.sh work without valgrind
 2017-03-13 09:19:37 +01:00
Enno Rehling
ba3f3a17d3 require that main.c declare any ini variables that we might expect. 2017-03-12 21:03:38 +01:00
Enno Rehling
4b88a5abc7 BUG 2301: validate [game] section in eressea.ini 
load_inifile is old stuff, should use config_get instead.
 2017-03-12 19:48:44 +01:00
Enno Rehling
7b4550b9d6 kill faction.nregions, it is calculated but never read. 2017-03-12 14:20:34 +01:00
Enno Rehling
a93dc5459b BUG 2313: spells must not be counted. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:39:25 +01:00
Enno Rehling
d8e5feac61 additional test for bug 2313. 
do not count spells toward num_unit or num_people.
 2017-03-12 13:24:32 +01:00
Enno Rehling
decc38a056 BUG 2313: proper accounting in remove_unit. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:02:55 +01:00
Enno Rehling
4c21ff5d63 BUG 2311: enforce all unit limits. 2017-03-11 20:30:17 +01:00
Enno Rehling
d633c2a9fb BUG 2310: counting units and people. 
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
 2017-03-11 19:36:26 +01:00
Enno Rehling
0f2744fcf3 BUG 2285: remove factions' wealthfrom statistics. 2017-03-11 18:10:23 +01:00
Enno Rehling
0bfd1feee6 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/kernel/item.c
 2017-03-11 14:49:31 +01:00
Enno Rehling
51ec560f72 Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
	src/kernel/item.c
	src/modules/arena.c
 2017-03-11 14:41:25 +01:00
Enno Rehling
cdf13c9fec stop using test_create_world, use test_setup. 2017-03-11 14:22:21 +01:00
Enno Rehling
be0b54494e clean up some tests. 
the test locale gets some extra strings.
test_create_world is bad, stop using it. unfinished.
 2017-03-10 21:29:37 +01:00
Enno Rehling
40e0a9a65f merge bugs 2017-03-06 22:21:27 +01:00
Enno Rehling
7022ae05bd Merge branch 'master' into develop 
Conflicts:
	src/kernel/item.c
	src/modules/arena.c
 2017-03-06 22:20:22 +01:00
Enno Rehling
ba8f51b7d4 Merge pull request #667 from ennorehling/hotfix/config-2301 
fix bugs 2301, 2302, 2303
 2017-03-06 21:57:23 +01:00
Enno Rehling
05bb109a09 BUG 2303: allied units are not traitors. 
had to rewrite the creport code for this, it is probably less efficient now than ever, but at least it works.
 2017-03-06 21:35:48 +01:00
Enno Rehling
1c72b0f297 warn about missing game.mailcmd setting 2017-03-06 20:52:06 +01:00
Enno Rehling
f4eda9f59e prefer dice to dice_rand 2017-03-06 06:28:12 +01:00
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
0379a17350 make report_resource return an rtype, not a name. 2017-03-05 17:42:57 +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
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
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
d976ee6f67 special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +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
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
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
2eb88c472c have I bollocksed up the deny/allow rules? looks like it 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
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
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
56eb1b753c fix header missing a struct 2017-02-26 15:52:58 +01:00
Enno Rehling
f406c47657 use converter frm noxml branch 2017-02-26 15:30:58 +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
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
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
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