Enno Rehling
25966b3d7f
add tests for snowglobe error messages
2016-01-01 16:30:09 +01:00
Enno Rehling
4952f212b8
snowglobe error messages. todo: testing (how?)
2015-12-31 14:43:38 +01:00
Enno Rehling
e7c23b15db
add missing files
2015-12-30 21:22:28 +01:00
Enno Rehling
e1f3b3cdcf
passing order object into lua use-functions, so we can use them in error messages.
2015-12-30 21:20:59 +01:00
Enno Rehling
14afee6093
Merge pull request #447 from TurnerSE/feature/xmas2015
...
Feature/xmas2015 iteminfo
2015-12-30 11:25:20 +01:00
Philipp Dreher
18f2cc1d70
cosmetic changes to iteminfo of skillpotion
2015-12-29 09:43:30 +01:00
Philipp Dreher
7b2aa821d0
Added iteminfo for snowglobe in DE+EN
2015-12-29 09:42:54 +01:00
Enno Rehling
899738a93c
Merge pull request #446 from ennorehling/xmas
...
xmas item 2015
2015-12-26 11:49:37 +01:00
Enno Rehling
d9588fb7fb
no snowglobe in E3
...
include xmas tests in tests/e2, not in run-tests files
2015-12-26 11:20:37 +01:00
Enno Rehling
92636cfcd9
put the new(ish) email subject line in the CR,
...
as reported in https://bugs.eressea.de/view.php?id=2016
2015-12-26 11:05:03 +01:00
Enno Rehling
b66b6f7f4c
testing christmas items, removing old xmas scripts
2015-12-22 19:33:44 +01:00
Enno Rehling
e678c1bcce
disable snowglobe test, because we are not ready yet
2015-12-22 18:49:11 +01:00
Enno Rehling
cf90f8cf93
it's beginning to look a lot like christmas
...
Conflicts:
scripts/eressea/xmas.lua
2015-12-22 18:46:57 +01:00
Enno Rehling
80e0707cb2
snowglobe transformations for several trerrains. messages still TBD
2015-12-22 18:46:45 +01:00
Enno Rehling
3fd4884584
putting all of the pieces together for the snow globe, with final use implementation still TBD
...
Conflicts:
scripts/eressea/xmasitems.lua
src/laws.c
2015-12-22 18:46:42 +01:00
Enno Rehling
81888132e4
add a lua binding to convert user-language strings to directions
2015-12-22 18:45:27 +01:00
Enno Rehling
55c15c1905
add a lua binding to convert user-language strings to directions
2015-12-22 18:38:12 +01:00
Enno Rehling
5e3ab01f17
Merge pull request #438 from ennorehling/master
...
Address MS Visual Studio 2015 update 1 breaking changes
2015-12-16 17:00:39 +01:00
Enno Rehling
24f559b4ad
Address MS Visual Studio 2015 update 1 breaking changes
2015-12-16 16:55:52 +01:00
Enno Rehling
9b5b79e75d
Merge pull request #431 from ennorehling/master
...
magic resistance never higher than 90%
2015-12-06 20:50:01 +01:00
Enno Rehling
9b7d4adda5
https://bugs.eressea.de/view.php?id=2173#c6397
...
by request: magic resistance never higher than 90%, so highly skilled monsters cannot become completely invincible to magic.
2015-12-06 20:48:22 +01:00
Enno Rehling
6651292e9b
Merge pull request #430 from ennorehling/master
...
rewrite the rules for magical damage reduction
2015-12-06 18:38:42 +01:00
Enno Rehling
d04d8e782e
https://bugs.eressea.de/view.php?id=2173
...
rewrite the rules for magical damage reduction
2015-12-06 18:34:31 +01:00
Enno Rehling
bf2920d1ae
fix warnings on gcc
2015-12-05 17:25:47 +01:00
Enno Rehling
7c7206fafd
Merge pull request #425 from ennorehling/hotfix-3.7.4
...
hotfix: https://bugs.eressea.de/view.php?id=2166
2015-12-05 17:24:23 +01:00
Enno Rehling
62ee1468b8
https://bugs.eressea.de/view.php?id=2166
...
* fix magic resistance calculation in calculate_armor.
* add related tests.
* refactor BF_CANATTACK -> BF_NO_ATTACK because it is easier.
2015-12-05 17:17:21 +01:00
Enno Rehling
2942babb0d
make curl be quiet when uploading to the cloud
2015-11-28 22:09:59 +01:00
Enno Rehling
5145362485
backup datafile and eressea.db to box.net
2015-11-26 16:36:50 +01:00
Enno Rehling
0c7c67a7ab
Merge pull request #413 from ennorehling/master
...
fixed ships taking damage in a storm
2015-11-25 12:09:28 +01:00
Enno Rehling
4e4a11d40c
Merge remote-tracking branch 'upstream/master'
2015-11-25 12:06:22 +01:00
Enno Rehling
42cfe7d5ee
Merge pull request #411 from ennorehling/feature/monster-tests
...
sea serpents can attack on oceans
2015-11-25 12:05:18 +01:00
Enno Rehling
f301bec623
addressing comments by solthar on bug 2164, PR #408 : storms should still cause damage to ships.
...
cleaning up some configuration lookups in sail, moving them outside of loops.
2015-11-25 12:04:09 +01:00
Enno Rehling
bdc5372537
disable test for seaserpent piracy (planned for 3.8)
2015-11-24 16:12:33 +01:00
Enno Rehling
1b3c8ea466
import monsters tests from PR #404
...
Monsters (i.e. sea serpents) can attack on oceans, when not guarding
2015-11-24 14:57:50 +01:00
Enno Rehling
f09833142a
Merge pull request #408 from ennorehling/master
...
https://bugs.eressea.de/view.php?id=2164
2015-11-23 19:10:24 +01:00
Enno Rehling
d45f16982d
https://bugs.eressea.de/view.php?id=2164
...
ships no longer receive damage from drifting. eliminating the code for this, instead of just the configuration parameters, since all active games now agree on this rule.
2015-11-23 18:41:11 +01:00
Enno Rehling
1ed0eaf473
release version 3.7.3
2015-11-23 17:10:49 +01:00
Enno Rehling
0e5fcbbc7c
Merge pull request #407 from ennorehling/release-3.7
...
bugfixes 2163, 2164 and 2165
2015-11-23 17:07:11 +01:00
Enno Rehling
4b7b32cbb5
use monster_attack, not explicit create_order, because we need to check buildings, etc.
2015-11-23 17:00:07 +01:00
Enno Rehling
defd870cd1
https://bugs.eressea.de/view.php?id=2163
...
Fix order of Arguments when checking for defensive building.
Solthar reminds us that good variable names are good.
2015-11-23 16:48:05 +01:00
Enno Rehling
b6a947ca0c
https://bugs.eressea.de/view.php?id=2165
...
Monster bewachten nicht, wenn sie nicht ausreichend bewaffnet waren, weil der nötige Check nicht in can_start_guarding gemacht wurde, sondern in guard_on_cmd.
2015-11-23 15:35:26 +01:00
Enno Rehling
c7ab0e8f59
fix https://bugs.eressea.de/view.php?id=2164 (ships get no damage when they drift).
...
simplify attack_chance configuration, set it only once.
this way, I can more easily fudge it to 1.0 in the debugger.
2015-11-23 12:37:42 +01:00
Enno Rehling
f0a47321d6
reduce log spam
2015-11-21 21:49:33 +01:00
Enno Rehling
8e4b9283a3
release version 3.7.2
2015-11-16 14:34:30 +01:00
Enno Rehling
ef7b252260
fix intermittent test
2015-11-16 14:34:18 +01:00
Enno Rehling
bf969879cd
release version 3.7.1
2015-11-16 14:28:47 +01:00
Enno Rehling
c404f40d86
Merge pull request #403 from ennorehling/release-3.7
...
fix a minor warning, get ready for 3.7 release
2015-11-16 14:27:23 +01:00
Enno Rehling
d07f359acb
fix a minor warning, get ready for 3.7 release
2015-11-16 14:12:51 +01:00
Enno Rehling
2fa388d099
Merge pull request #399 from TurnerSE/bug/#2119-2
...
Moved the description of skillpotion to another namespace
2015-11-16 13:52:14 +01:00
Philipp Dreher
1562439ca9
Moved the description of skillpotion to another namespace
...
Skillpotion isn't actually defined as a potion (or part of the
alchemy-system), therefore the description needs to be moved to the
namespace "iteminfo" to be found.
2015-11-16 03:22:19 +01:00
