Commit graph

10987 commits

Author SHA1 Message Date
Enno Rehling
5b1d787102 Merge branch 'stm2-confusion_and_panic' into develop 2021-03-24 21:19:06 +01:00
Enno Rehling
081965f0bc remove BATTLE_FAST code
it didn't actually make battles fast.
2021-03-24 21:13:59 +01:00
Enno Rehling
44765edede Merge branch 'develop' into stm2-confusion_and_panic 2021-03-24 21:07:16 +01:00
Enno Rehling
35f562a53f fix damage calculation, again
scale_number was messing with the hp
2021-03-24 21:04:50 +01:00
Enno Rehling
195e49e7f0 disable the battle.fast cache
it doesn't look very good, anyhow
let's see how much that actually costs
2021-03-24 20:58:33 +01:00
Enno Rehling
b5cc4e6fac flee_spell did not need an extra argument
checking for precombat spells is easy and safe!
2021-03-24 20:58:32 +01:00
Enno Rehling
a2d4345f49 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
fc438fe0a7 terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-24 20:58:32 +01:00
Enno Rehling
47fba27e2a we do not need cmake 3.19 2021-03-24 20:58:32 +01:00
Enno Rehling
73e20b0770 on macos, there is apparently no ncursesw 2021-03-24 20:58:32 +01:00
Enno Rehling
8ed2738bc0 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
0928fe0d02 terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-24 20:58:32 +01:00
Enno Rehling
c2633afdf5 we do not need cmake 3.19 2021-03-24 20:58:32 +01:00
Enno Rehling
c7bbb97286 on macos, there is apparently no ncursesw 2021-03-24 20:58:32 +01:00
Enno Rehling
52ba83addd fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
d85ac9b2f9 terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-24 20:58:32 +01:00
Enno Rehling
9701cf9d94 we do not need cmake 3.19 2021-03-24 20:58:32 +01:00
Enno Rehling
28d35eec7a on macos, there is apparently no ncursesw 2021-03-24 20:58:32 +01:00
Steffen Mecke
fae0c2608c fix for flee spell 2021-03-24 20:58:32 +01:00
Enno Rehling
8b2857f582 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
6feb616c2d terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-24 20:58:32 +01:00
Enno Rehling
f43dd0867c we do not need cmake 3.19 2021-03-24 20:58:31 +01:00
Enno Rehling
cb0ba86593 on macos, there is apparently no ncursesw 2021-03-24 20:58:31 +01:00
Enno Rehling
235075b54e fix recent change for terraforming herbs 2021-03-24 20:58:31 +01:00
Enno Rehling
d3b8c7a2d2 terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-24 20:58:31 +01:00
Enno Rehling
bf15070c94 we do not need cmake 3.19 2021-03-24 20:58:31 +01:00
Enno Rehling
e4967d01ea on macos, there is apparently no ncursesw 2021-03-24 20:58:31 +01:00
Enno Rehling
48b0e41c86 fix recent change for terraforming herbs 2021-03-24 20:58:31 +01:00
Enno Rehling
970e3c5432 terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-24 20:58:31 +01:00
Enno Rehling
db1523d7ad we do not need cmake 3.19 2021-03-24 20:58:31 +01:00
Enno Rehling
6da06ae4d4 on macos, there is apparently no ncursesw 2021-03-24 20:58:31 +01:00
Steffen Mecke
f48a37e4c7 e3 test irrelevant 2021-03-24 20:58:30 +01:00
Steffen Mecke
807177cc68 reverting "fix" 2021-03-24 20:57:46 +01:00
Steffen Mecke
a713779f34 Gesang der Verwirrung bringt Buchhaltung durcheinander 2021-03-24 20:57:46 +01:00
Enno Rehling
19db01af67 new volcano damage calculation was broken. 2021-03-24 20:56:30 +01:00
Enno Rehling
335740d12b undo curse_active change
curses should survive the death of a magician.
good dreams needs a magician to decide allegiance.
2021-03-23 21:03:12 +01:00
Enno Rehling
13f9006148 add a test for gooddreams skill modifier. 2021-03-23 20:01:42 +01:00
Enno Rehling
b31715a71e Merge branch 'stm2-gooddreams_mage' into develop 2021-03-23 19:27:47 +01:00
Enno Rehling
a9a7609a9a make curse_active check for a magician.
fix tests that were using curses without a creator.
2021-03-23 19:27:11 +01:00
Enno Rehling
5e7fba50d6 Dämonen können magisch reanimiert werden. 2021-03-23 18:53:11 +01:00
Enno Rehling
5452987cb7 flee_spell did not need an extra argument
checking for precombat spells is easy and safe!
2021-03-23 18:53:11 +01:00
Enno Rehling
b6e084c758 fix recent change for terraforming herbs 2021-03-23 18:52:42 +01:00
Enno Rehling
bb82df04c4 terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-23 18:52:42 +01:00
Enno Rehling
5d2dbcb93a we do not need cmake 3.19 2021-03-23 18:52:42 +01:00
Enno Rehling
de1386dba6 on macos, there is apparently no ncursesw 2021-03-23 18:52:42 +01:00
Enno Rehling
de9918f018 fix recent change for terraforming herbs 2021-03-23 18:52:06 +01:00
Enno Rehling
3ef6559c5f terraforming changes herbs
https://bugs.eressea.de/view.php?id=2730
2021-03-23 18:52:06 +01:00
Enno Rehling
26edfea405 we do not need cmake 3.19 2021-03-23 18:52:06 +01:00
Enno Rehling
09c257a3d0 on macos, there is apparently no ncursesw 2021-03-23 18:52:05 +01:00
Enno Rehling
181d82819a fix unsigned mismatch 2021-03-23 18:51:38 +01:00