Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,427 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

733 Commits

Author SHA1 Message Date
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
Enno Rehling 4397c67d1c bug 2197: add acceptance test for Wasser des Lebens 2017-12-26 13:23:14 +01:00
Enno Rehling abd2a398d1 check that newbie immunity prevents guarding 2017-12-22 20:12:05 +01:00
Enno Rehling 77cf7f6876 new factions cannot guard 2017-12-22 20:07:30 +01:00
Enno Rehling 73f49ec90a fix demon hunger in E3 and one intermittent test. 
tests involving demons can disable skill changes.
 2017-12-22 19:14:01 +01:00
Enno Rehling 683e3c566d addendum bug 2389: insects mail not sail a ship into a glacier, but can be passengers. 2017-12-17 14:50:11 +01:00
Enno Rehling ed75f4d21a fix bug 2389 (sailing into glaciers). 
reduce verbosity.
 2017-12-17 14:28:15 +01:00
Enno Rehling 3685bcabfb BUG 2389: insects starve in glaciers. 
add feature tests for hunger.
 2017-12-17 14:06:40 +01:00
Enno Rehling 714e44cd71 BUG 2392: remove minskill attribute from any weapons. 2017-12-17 10:19:07 +01:00
Enno Rehling 0f014153c0 add a test that proves bug 2392 to be user error. 2017-12-16 20:41:03 +01:00
Enno Rehling 5977ca51b5 tests for insects, prepare for bug 1841 
another test for appeasement, fix guard bug 2389
 2017-12-15 17:16:00 +01:00
Enno Rehling 2257ba3f56 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-13 19:46:13 +01:00
Steffen Mecke ac9d5a8019 test movement capacity examples from rules 2017-12-13 17:53:05 +01:00
Enno Rehling 691dde5960 unit test ROUTE. 2017-12-11 16:24:06 +01:00
Enno Rehling 2ca236e68c Add lua tests for ROUTE. 2017-12-10 20:54:02 +01:00
Enno Rehling 8efc7f1829 BUG 2391: Friedenslied erlaubt Flucht aus der Region. 2017-12-09 10:44:02 +01:00
Enno Rehling 6c18604bce Failing acceptance test for bug 2391. 2017-12-09 10:24:31 +01:00
Enno Rehling 9163d166ec cppcheck style fixes. 
delete dead functions.
reactivate patzer_deathcloud.
 2017-12-08 19:59:49 +01:00
Enno Rehling 6923fe5c53 fix lua dbupdate 
write sqlite data to a temporary db by default (configurable).
 2017-11-10 16:29:48 +01:00
Enno Rehling 34808a25c5 Merge branch 'develop' 2017-11-09 18:04:41 +01:00
Enno Rehling c597bebb8b fix drowning (it's not dependeing on icebergs). 2017-11-05 20:52:04 +01:00
Enno Rehling 34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling 5e204083b8 remove noreply email, monster report. 2017-09-18 21:43:52 +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 127cc41e8e BUG 1779: Elfenwald-Effekte bei Trankzaubern. 
https://bugs.eressea.de/view.php?id=1779
 2017-09-05 18:56:47 +02:00
Enno Rehling 18abbb6c49 fix intermittent test caused by produceexp 2017-09-04 14:38:39 +02:00
Enno Rehling 108268fa17 BUG 2269: Vertraute vergessen ihre Magie nicht. 2017-09-01 22:10:38 +02:00
Enno Rehling 0b6f5aa064 handle eressea.ini containing a 0 to disable modules 2017-08-28 00:04:05 +02:00
Enno Rehling 8517857d55 BUG 2361: familiars cannot forget magic. 
https://bugs.eressea.de/view.php?id=2361
 2017-08-27 19:55:04 +02:00
Enno Rehling 6d1fe2842a leak: free special directions. 2017-08-25 08:52:15 +02:00
Enno Rehling 3445e376e0 allow GIVE PERSON for undead race, too 2017-07-22 12:36:01 +02:00
Enno Rehling 485019ce7e Merge pull request #710 from ennorehling/feature/2337-lighthouse-capacity 
BUG 2337: new lighthouse capacity calculation
 2017-07-22 07:56:49 +02:00
Enno Rehling 3c2754071d this test fails when btype->maxsize isn't used as a limit for building. 2017-07-17 14:01:08 +02:00
Enno Rehling 0bf003cdc4 add a test for btype.maxsize 2017-07-17 13:37:40 +02:00
Enno Rehling ed4cb5324b Merge branch 'master' into develop 2017-07-16 11:24:38 +02:00
Enno Rehling b6f40148d7 off-by-one in NMR count 2017-07-16 11:24:16 +02:00
Enno Rehling 427d32c9d2 Merge pull request #708 from ennorehling/2331-undead-give 
BUG 2331: allow GIVE for undead.
 2017-07-15 12:44:47 +02:00
Enno Rehling 8344f41a70 allow GIVE for juju, ghast, skelord, too. 
make the tests nicer.
 2017-07-15 12:28:26 +02:00
Enno Rehling a0afa1f225 Merge pull request #707 from ennorehling/develop 
BUG 2256: kill the FFL_NEWID flag
 2017-07-09 15:50:07 +02:00
Enno Rehling de9d73bd5a fix test to match new flag values 2017-07-09 15:43:37 +02:00
Enno Rehling 2107a84b0d also allow GIVE for ghouls and skeletons. 2017-07-09 15:25:33 +02:00
Enno Rehling 60efb12d70 Zombies koennen Personen gebn 2017-07-09 13:37:46 +02:00
Enno Rehling eed93b7470 BUG 2334 and 2339: fix script update and init calls 
Ponnuki and Portals scripts are working.
Ponnuki may still attack? More testing required.
 2017-06-18 12:23:19 +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 8e15487a1e BUG 2328: wrong calendar seasons. 2017-05-26 06:27:25 +02:00
Enno Rehling 11d9afc62e BUG 2322: Test and bugfix for castle names. 2017-05-12 22:05:14 +02:00
Enno Rehling 7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling ad465f1028 Ponnuki should not be aggressive. 2017-05-07 17:29:55 +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 5dea221b8b quick fix for intermittent spells 2017-05-06 10:56:44 +02:00
Enno Rehling ccf90413e6 start cleaning up random bindings 2017-05-04 06:44:33 +02:00
Enno Rehling 83d40962d2 disable randomness that causes some tests to become intermittent. 
fix normalvariante and chance so they work better with constant
rng always returning zero
 2017-05-02 08:45:18 +02:00
Enno Rehling 8e9866f0ce additional tests for spells. 
also some support functionality for lua tests.
 2017-05-01 19:09:00 +02:00
Enno Rehling 976b23be72 refactor E3 to use the same raindance/harvest spells as E2. 
only indirect effects are different.
 2017-04-30 21:39:08 +02:00
Enno Rehling 74673f172f test for raindance/harvest spells, both games 2017-04-30 21:38:30 +02:00
Enno Rehling fb8f63e73b also fix the test 2017-04-30 17:48:08 +02:00
Enno Rehling 6da21dbbe9 Zaubertests in Ebenen sind unstabil. 
In E3 bekommen Elfen eien Bonus im Wald.
 2017-04-30 17:42:16 +02:00
Enno Rehling df96589ea6 add tests for earn_silver. 
this is an odd one, don't want to break it.
 2017-04-30 17:25:24 +02:00
Enno Rehling 7a289ceb86 simplify building_taxes, eliminate dead lua callbacks. 2017-04-29 19:21:48 +02:00
Enno Rehling f2d8392206 add tests for correct castle stage names. 2017-04-25 16:47:26 +02:00
Enno Rehling 8b02c540fd re-enable accidentally disabled tests 2017-04-25 13:27:13 +02:00
Enno Rehling 091a8de6b6 Merge branch 'master' into develop 
Conflicts:
	src/kernel/race.c
	src/spy.c
 2017-04-22 18:38:34 +02:00
Enno Rehling e530543022 demon stealth: cloak as other race. 
added a Lua test.
get_race oob fix (potential crash).
 2017-04-22 18:33:47 +02:00
Enno Rehling 7e4f55a1ac enable ponnuki 2017-04-22 13:53:06 +02:00
Enno Rehling 91fc9f9a1e enable ponnuki 2017-04-22 13:52:45 +02:00
Enno Rehling b9b1a71d89 Merge branch 'master' of github.com:eressea/server 2017-04-09 13:56:10 +02:00
Enno Rehling aebc7d4cac BUG 2138: Ponnuki is dead, long live Ponnuki 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:40:42 +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 1c509485f7 Merge pull request #682 from ennorehling/develop 
cmake changes, skillmod rewrite
 2017-04-08 22:14:53 +02:00
Enno Rehling 989ff65ca9 BUG 2318: disable ponnuki 2017-04-08 22:08:19 +02:00
Enno Rehling 599b4a8311 BUG 2318: disable ponnuki 2017-04-08 22:07:12 +02:00
Enno Rehling 7c680481de iron golems can build dwarf armor in E3. 2017-04-02 15:43:14 +02:00
Enno Rehling 8bb7cf8878 WIP: this error has a new message. 2017-04-02 15:39:50 +02:00