summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-clouds.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-01-27 16:23:58 -0700
committerSteve Melenchuk <smelenchuk@gmail.com>2014-01-27 16:23:58 -0700
commitcfacb1039cb948b213ff066e7d6bbd7b8c55f0aa (patch)
tree5f8162989f66cef4ce5a0f5a360fadf7c4f22044 /crawl-ref/source/spl-clouds.cc
parentc7e39278c09070980bc29b4ebe06058dc6e3c077 (diff)
downloadcrawl-ref-cfacb1039cb948b213ff066e7d6bbd7b8c55f0aa.tar.gz
crawl-ref-cfacb1039cb948b213ff066e7d6bbd7b8c55f0aa.zip
Harshen piety hits for Dith firestarting; fix some edge cases.
Forest fires, Conjure Flame, and Ring of Flames now incur piety hits properly, and the piety hits for everything else are much harsher (you're probably going to get penance for trying to do anything fire-related).
Diffstat (limited to 'crawl-ref/source/spl-clouds.cc')
-rw-r--r--crawl-ref/source/spl-clouds.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/spl-clouds.cc b/crawl-ref/source/spl-clouds.cc
index be3d4edc6d..f19c3f2b0e 100644
--- a/crawl-ref/source/spl-clouds.cc
+++ b/crawl-ref/source/spl-clouds.cc
@@ -17,6 +17,7 @@
#include "coordit.h"
#include "env.h"
#include "fprop.h"
+#include "godconduct.h"
#include "items.h"
#include "losglobal.h"
#include "message.h"
@@ -104,6 +105,8 @@ spret_type conjure_flame(int pow, const coord_def& where, bool fail)
fail_check();
+ did_god_conduct(DID_FIRE, min(5 + pow/2, 23));
+
if (cloud != EMPTY_CLOUD)
{
// Reinforce the cloud - but not too much.
@@ -249,6 +252,7 @@ spret_type cast_ring_of_flames(int power, bool fail)
}
fail_check();
+ did_god_conduct(DID_FIRE, min(5 + power/5, 50));
you.increase_duration(DUR_FIRE_SHIELD,
5 + (power / 10) + (random2(power) / 5), 50,
"The air around you leaps into flame!");