Commit graph

186 commits

Author SHA1 Message Date
Enno Rehling
b31a1f798c BUG 2346: extract a test for ship tactics bonus. 2018-05-03 23:00:28 +02:00
Enno Rehling
3cb1d1a071 simplify race masking for weapon modifiers. 2018-04-29 13:13:10 +02:00
Enno Rehling
6c0f8a81f6 merge from master 2018-02-26 19:51:48 +01:00
Enno Rehling
622c103b00 more cppcheck messages 2018-02-26 19:48:52 +01:00
Enno Rehling
432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +01:00
Enno Rehling
7b01581302 CATAPULT_STRUCTURAL_DAMAGE was broken.
check for PDCURSES, not WIN32
2018-02-25 14:29:25 +01:00
Enno Rehling
e4aa8f505e cppcheck warnings for battle 2018-02-25 14:18:36 +01:00
Enno Rehling
ad86e69e6b refactor the resurrection code. There is more work to be done here, too much duplicaton between battle and volcano. 2018-02-15 21:05:11 +01:00
Enno Rehling
a9375200e4 use_potion has a lot of scaffolding that use_healingpotion was duplicating. 2018-02-15 20:41:40 +01:00
Enno Rehling
cc278896f9 DRY: change mistletoe code
add some debug logic to intermittent test
2018-01-22 19:22:56 +01:00
Enno Rehling
0b036557c0 test that mistletoe users survive attacks. 2018-01-21 18:13:42 +01:00
Enno Rehling
1eaa1e6d84 BUG 2405: use mistletoe to create effect, use effect to flee from battle. 2018-01-21 18:07:49 +01:00
Enno Rehling
2493b01883 make some changes to support non-random skill progress.
disable test_drain_exp, since it can't deal with that.
2018-01-21 11:03:50 +01:00
Enno Rehling
d38582360a mistletoe as curse (bad idea) 2018-01-21 11:03:48 +01:00
Enno Rehling
3d69f4e372 start removing dependencies on potion_type.
use item_type where we can. does not compile, is WIP.
2018-01-14 17:40:48 +01:00
Enno Rehling
7b8951b6e8 kill the fleechance attribute 2018-01-11 16:47:22 +01:00
Enno Rehling
396e0f6bd7 remove bsdstring from battle. 2018-01-01 01:17:16 +01:00
Enno Rehling
643c989cf9 BUG 2401: fix attacker list, move code to reports.c 2017-12-31 15:05:49 +01:00
Enno Rehling
a8140f1dc9 rename strlcpy->str_strlcpy, etc. 2017-12-30 19:49:21 +01:00
Enno Rehling
095148ab50 move va_copy macro closer to where it is used. 2017-12-29 17:00:16 +01:00
Enno Rehling
f98eab56c4 platform.h is only for WIN32 now.
replace MIN and MAX macros, they are BAD.
2017-12-29 06:13:28 +01:00
Enno Rehling
e2f954b7f6 BUG 2392: anyone can use weapons, as long as they have _some_ skill. 2017-12-17 10:16:56 +01:00
Enno Rehling
761f40f782 FFL_CURSED is forever 2017-12-12 21:34:34 +01:00
Enno Rehling
02248e0c54 fix coverity scan errors 2017-12-12 09:19:47 +01:00
Enno Rehling
93613b99af slprintf is not in BSD (it's theft from samba). 2017-12-11 19:23:56 +01:00
Enno Rehling
9f391039b5 more bsdstring removal, str_replace, unit tests. 2017-12-11 18:20:21 +01:00
Enno Rehling
643883d539 remove some more unused defines. 2017-12-09 11:17:39 +01:00
Enno Rehling
8efc7f1829 BUG 2391: Friedenslied erlaubt Flucht aus der Region. 2017-12-09 10:44:02 +01:00
Enno Rehling
5192ffdb60 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-08 20:18:29 +01:00
Enno Rehling
1b9a686101 fix berkeley size/ulen error
remove weather module (unused)
2017-12-08 20:18:01 +01:00
Enno Rehling
9163d166ec cppcheck style fixes.
delete dead functions.
reactivate patzer_deathcloud.
2017-12-08 19:59:49 +01:00
Enno Rehling
34808a25c5 Merge branch 'develop' 2017-11-09 18:04:41 +01:00
Enno Rehling
5af5daa355 BUG 2378: Fix magic armor resistance calculation.
Use frac_one constant where applicable.
2017-10-29 18:55:43 +01:00
Enno Rehling
79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling
b337373bc9 shorten some names, too many messages with the same prefix are inefficient. 2017-10-16 20:38:52 +02:00
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02:00
Enno Rehling
455e03fa05 try and make coverity understand the equipment trie.
shorten names.
2017-09-17 20:42:43 +02:00
Enno Rehling
2dd159841e Merge branch 'master' into develop 2017-08-24 16:47:24 +02:00
Enno Rehling
7985ebe511 replace ct_find calls with constants.
reorder a lot of includes.
2017-08-21 20:18:19 +02:00
Enno Rehling
c99e92db20 kill curse cache logic, it was a bad idea.
ct_find is almost never what we want to do.
2017-08-21 19:43:35 +02:00
Enno Rehling
54b5b09e15 Merge branch 'master' into develop
Conflicts:
	src/gmtool.c
	src/modules/autoseed.c
2017-08-18 20:31:14 +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
Steffen Mecke
160ef71d40 refactor for STUDYDAYS 2017-08-01 22:09:57 +02:00
Steffen Mecke
1edfb7ae8e use STUDYDAYS consequently 2017-08-01 22:09:57 +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
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
88626fb163 optimization: select_fighters.
use select_fighters with callback to reduce the number of selected units for (most) combat spells.
2017-05-21 12:26:04 +02:00
Enno Rehling
5778bc2c93 no more than 4 critical hits 2017-05-02 09:59:04 +02:00