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

705 commits

Author SHA1 Message Date
Enno Rehling
281ed3d3e9 Remove remainder of old the tunnel implementation with b:add_action(). 2018-10-14 17:53:48 +02:00
Enno Rehling
d8468dc83f Merge remote-tracking branch 'upstream/develop' into develop 2018-10-13 20:27:42 +02:00
Enno Rehling
92c6fb9bac
Merge branch 'develop' into bug2480 2018-10-13 20:25:13 +02:00
Enno Rehling
772386ffc7 debug logging did not help. nothing unusual here, just weirdly intermittent. 2018-10-12 20:46:48 +02:00
Enno Rehling
e234a0db6f write the htpasswd file, again 2018-09-26 20:21:56 +02:00
Enno Rehling
74aa4bdaf3 bindings for gamedb_update, run after turn. 2018-09-25 20:39:43 +02:00
Enno Rehling
658b47aeb4 remove seaserpent test that is not a test. 2018-09-15 19:12:32 +02:00
Enno Rehling
681cf32e1f remove besiege from keywords[] array 
fix broken at_keys attributes
remove unused global.attribs
 2018-09-15 18:35:27 +02:00
Enno Rehling
d6e8b38724 FOLGE SCHIFF reparieren (hat UFL_LONGORDER getestet). 2018-09-12 20:35:27 +02:00
Steffen Mecke
c15b4c8fbf refactor terminate (calculate_armor/resistance) 2018-09-12 15:11:34 +02:00
Enno Rehling
2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling
9456c4bdc7 fix debug logging. 2018-09-09 15:16:11 +02:00
Enno Rehling
67089aeb8c Bug 2487: Fix LERNE AUTO translations 
Also disallow autolearning expensive skills.
 2018-09-09 15:13:20 +02:00
Steffen Mecke
aed7432bb2 fix magic resistance (bug 2480) 2018-09-04 16:41:46 +02:00
Enno Rehling
fc0616ed1e kill lua triggers for npc logic, never used. 2018-08-03 06:47:29 +02:00
Enno Rehling
e89fe69d58 simplicate the sink_ship function, do not rescue units. 2018-08-01 11:55:57 +02:00
Enno Rehling
ad0464ab50 BUG 2168: call sink_ship for ships that take too much damage. 2018-08-01 10:04:12 +02:00
Enno Rehling
7eb951544a equip_newunits got called twice. 2018-07-30 22:19:40 +02:00
Enno Rehling
cd6154cae6 fix the lighthouse crash in preview. 2018-07-22 10:55:09 +02:00
Enno Rehling
fc80e4b83e BUG 2462: Leuchtturm meldet keine Landregionen, beschützt Schiffe erst ab Größe 10. 2018-07-17 20:53:34 +02:00
Enno Rehling
64eb545b4a Bug 2460: Startgeschenke 2018-07-12 20:24:23 +02:00
Enno Rehling
6d10ee8fa5 BUG 2453: Erstausstattung und Default-Befehle für neue Parteien. 2018-06-24 18:08:19 +02:00
Enno Rehling
ade7b2ef43 BUG 2446: trade prices not getting read from XML. 2018-06-10 09:58:26 +02:00
Enno Rehling
dfa0ff09d1 Suppress some false positive coverity results. 
It apparently does not understand CuTest code well?
Add a check for Lua eff_skill binding.
 2018-05-19 20:53:51 +02:00
Enno Rehling
6608f1b1ab Merge branch 'develop' 2018-05-18 15:34:50 +02:00
Enno Rehling
409f5df9a9 po export code removed. 2018-05-17 23:29:12 +02:00
Enno Rehling
7a10a58605 1. nrmessage is locale-independent, uses locale_getstring 
2. unique strings:
rename aurapotion50 message.
delete unused bithday_firework definitions.
 2018-05-17 19:04:25 +02:00
Enno Rehling
064a0872ed Export strings to .po files (WIP). 2018-05-16 21:33:29 +02:00
Enno Rehling
0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling
269030082c remove struct equipment from the code entirely. 2018-05-15 21:51:47 +02:00
Enno Rehling
9dd38a6593 convert E2 familiars from XML to Lua 2018-05-15 06:58:07 +02:00
Enno Rehling
e46cfa5e77 remove even more equipment xml to Lua 
only familiars still TBD, I think.
 2018-05-14 22:01:32 +02:00
Enno Rehling
40a2a6735a mac build fix, dragon spoils equipment in Lua 2018-05-14 04:42:59 +02:00
Enno Rehling
2be0e9bd41 customize equipment for each game, in Lua. 
no more equipment.xml for e3
 2018-05-13 21:58:01 +02:00
Enno Rehling
a741eaca97 equip new orcs in e2 with lua and a hacky callback. 2018-05-13 21:23:54 +02:00
Enno Rehling
1d7318d9b6 test that new orcs have weapon skills. 2018-05-13 20:36:49 +02:00
Enno Rehling
4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +02:00
Enno Rehling
40125bb75e translate seed_%race% equipment from xml to lua. 2018-05-12 20:52:10 +02:00
Enno Rehling
298e220cfd Oh. E3 hat kein autoseed, ergo kein seed_elf equipment? 2018-05-12 19:18:25 +02:00
Enno Rehling
271352d0ba create a lua module that can handle simple euipments. 
lua test for equip_unit, with callbacks.
 2018-05-12 19:10:40 +02:00
Enno Rehling
89ecc54bdd deal with jsonconf defaults. 2018-05-10 22:20:28 +02:00
Enno Rehling
84bc08a381 all races can be on a boat by default. 
but now MAKETEMP is broken.
prefer assert_(not_)nil over assert_(not_)equal
 2018-05-10 22:10:26 +02:00
Enno Rehling
ad0491cecb Merge branch 'develop' 2018-05-10 20:03:16 +02:00
Enno Rehling
2a213d9302 try to analyze intermittent bug on travis 2018-05-10 18:03:47 +02:00
Enno Rehling
d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00
Enno Rehling
4bcaaa5f79 remove debug code 2018-05-07 20:24:59 +02:00
Enno Rehling
6746401330 BUG 2437: fetch_astral should have no aura cost when given bad units. 2018-05-07 20:22:02 +02:00
Enno Rehling
cfe21e7e1d re-enable tests, allow more spell arguments. 
a list of ships, units, etc can be long!
 2018-05-06 19:07:20 +02:00
Enno Rehling
14f59e4bfe functional tests for pull_astral spell. 2018-05-06 19:02:47 +02:00
Enno Rehling
cd2624de8a stop reallocation spell parameters. 
fix involuntary tree growth in test, message check.
 2018-05-06 15:49:34 +02:00
Enno Rehling
962b8082b7 fix test for lifepotion (tree growth was fuxxing it up) 2018-05-01 19:05:04 +02:00
Enno Rehling
e0cae602dd add a test for building items. 2018-04-30 23:18:39 +02:00
Enno Rehling
e0e873044d fix stone golems (assert). 
remove improvement logic from build().
 2018-04-30 23:11:13 +02:00
Enno Rehling
8a00cc3b96 foolpotion test is not intermittent if we disable study.random_progress 2018-02-24 18:58:50 +01:00
Enno Rehling
1f7a25b4c5 disable an intermittent check. 2018-02-24 16:48:39 +01:00
Enno Rehling
6c572c6287 rename potion: p14 to healing 
fix use_item message crash
 2018-02-17 20:35:00 +01:00
Enno Rehling
afe1cf34f3 rough acceptance test for elixir of power (p13) 2018-02-17 18:59:43 +01:00
Enno Rehling
d065cbfca7 use_item message with amount instead of usepotion without. 2018-02-17 15:30:38 +01:00
Enno Rehling
4a3ad7ac84 fix potion tests, re-enable foolpotion test 2018-02-17 15:22:44 +01:00
Enno Rehling
438ae6f905 Eliminate rules.magic.multipotion, it's too much code. 2018-02-17 15:17:05 +01:00
Enno Rehling
a2d23d01fa Test: Heiltrank heilt mehrere Einheiten. 2018-02-17 12:52:58 +01:00
Enno Rehling
96062f6f85 rename p2->lifepotion (WdL) 2018-02-17 10:45:56 +01:00
Enno Rehling
8a8bf489ae clarify use_potion responsibilities. 
move USE potion of life to items.c.
fix some use_ function return values.
 2018-02-17 10:39:23 +01:00
Enno Rehling
bf591ecec5 BUG 2415: eliminate at_potiondelay and WdL delay. 
BUG 2419: refactor ointment and healing, add tests for USE
 2018-02-15 20:25:58 +01:00
Enno Rehling
d15684a546 fix test_process_turn failure. 
move turn global to calendar.
promote calendar module to kernel.
 2018-02-14 20:01:36 +01:00
Enno Rehling
c6ba91981c fix turn processing check 2018-02-10 21:13:09 +01:00
Enno Rehling
77a8c24ead disable process test turn check (recent change). 
make all tests run from inside the tests directory
 2018-02-10 18:52:03 +01:00
Enno Rehling
eb6271bbb8 CID 182781 I broke the wage logic. 2018-02-10 17:53:59 +01:00
Enno Rehling
1ee6f5444a finish XInclude removal project. 
reduce number of XML files for E3.
 2018-02-06 21:28:55 +01:00
Enno Rehling
df255b886a verify xml loading, fix remaining files for e2. 2018-02-06 18:46:28 +01:00
Enno Rehling
da02c1b92e Use custom URI schemes for config files. 
TODO: XML files need to be rebased, XIncludes replaced.
 2018-02-05 17:46:11 +01:00
Enno Rehling
92f82c3608 plan to eliminate xinclude use, move to single config file with includes. 2018-02-05 17:46:11 +01:00
Enno Rehling
b6e8822044 BUG 2398: remove deltas from summary. 2018-01-27 21:48:05 +01:00
Enno Rehling
ff85cda724 stop using sqlite for a player database 2018-01-26 17:56:30 +01:00
Enno Rehling
1c535b8dda rough test of familiar spell 2018-01-26 17:45:40 +01:00
Enno Rehling
1edaaef99b remove debug output 2018-01-22 19:44:52 +01:00
Enno Rehling
7441b1e0eb disable nwbie immunity in test that requires ATTACK 2018-01-22 19:30:56 +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
6eae363487 disable the mistletoe test for now, it has no effect. 2018-01-21 11:18:06 +01:00
Enno Rehling
a8abca3f1c test potions with long-duration effect. 2018-01-21 11:03:51 +01:00
Enno Rehling
9ff04ec6db skip all xp draining tests 2018-01-21 11:03:50 +01:00
Enno Rehling
0b20c379b6 enhance foolpotion test. 2018-01-21 11:03:49 +01:00
Enno Rehling
d38582360a mistletoe as curse (bad idea) 2018-01-21 11:03:48 +01:00
Enno Rehling
2b3acb5d92 temporarily disable test for mistletoe, it is broken. 2018-01-11 16:51:21 +01:00
Enno Rehling
d2cbed3042 BUG 2408: acceptance test for TARNE PARTEI 2018-01-10 18:38:38 +01:00
Enno Rehling
6a31b432de disable storms in tests 2018-01-01 07:47:06 +01:00
Enno Rehling
77926d2d54 add soem debug output to intermittent test 2018-01-01 07:43:06 +01:00
Enno Rehling
fc570d2ec7 bug 2402: xmas fix 2017-12-31 11:36:47 +01:00
Enno Rehling
687f88d66e Merge branch 'master' into develop 2017-12-29 21:03:09 +01:00
Enno Rehling
d47bee5572 christmas 2017 2017-12-29 21:01:50 +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
198f084f5d implement speedy ships, with unit tests and edge testing. 2017-12-27 21:54:09 +01:00
Enno Rehling
c2167c963e add a (failing) acceptance test for speedy dragonships. fix the old ship tests. 2017-12-27 20:29:49 +01:00
Enno Rehling
fbcebbd2ca we cannot check the non-existence of a report. 2017-12-27 20:29:05 +01:00
Enno Rehling
cff4e12fbd celan up tests, rename test_cleanup -> test_teardown. 2017-12-27 19:58:39 +01:00
Enno Rehling
250faefff4 fix potion test, use only one 2017-12-27 07:11:21 +01:00
Enno Rehling
28252fda7b bug 2197: fix E3 potion text. 2017-12-26 16:09:15 +01:00
Enno Rehling
8e823c9403 Tests require regular trees, not mallorn. 2017-12-26 15:57:59 +01:00