summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-25 07:13:13 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-25 07:13:13 +0000
commitc04f1e2e70434d149a12d097f79efb9178e593ef (patch)
treeacc339e64561d64d13dd68a91f98bd370d0a407f /crawl-ref
parentcf35b85a5fffd0bf5c057bd92d4a236235d0892b (diff)
downloadcrawl-ref-c04f1e2e70434d149a12d097f79efb9178e593ef.tar.gz
crawl-ref-c04f1e2e70434d149a12d097f79efb9178e593ef.zip
[1813368] Makhleb/Vehumet passive power gain now active without needing to pray. Vehumet's spell boost and warding must still be prayed for.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2542 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/monstuff.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index b79eb7338c..b198d39281 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -598,9 +598,9 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent)
// Divine health and mp restoration doesn't happen when killing
// born-friendly monsters. The mutation still applies, however.
if (you.mutation[MUT_DEATH_STRENGTH]
- || (!created_friendly &&
- you.religion == GOD_MAKHLEB && you.duration[DUR_PRAYER] &&
- (!player_under_penance() && random2(you.piety) >= 30)))
+ || (!created_friendly
+ && you.religion == GOD_MAKHLEB
+ && (!player_under_penance() && random2(you.piety) >= 30)))
{
if (you.hp < you.hp_max)
{
@@ -612,7 +612,6 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent)
if (!created_friendly
&& (you.religion == GOD_MAKHLEB || you.religion == GOD_VEHUMET)
- && you.duration[DUR_PRAYER]
&& (!player_under_penance() && random2(you.piety) >= 30))
{
if (you.magic_points < you.max_magic_points)