summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-08-24 03:11:43 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-08-24 03:11:43 +0000
commit3a5353d8d400c14f7bf1d01a28340877662e6165 (patch)
tree8b29e38b7fe7b318dcc163e9c0669d0c99fc0596
parent8d0dc6c81b4ecd7027c119d1bf551d71f2338c68 (diff)
downloadcrawl-ref-3a5353d8d400c14f7bf1d01a28340877662e6165.tar.gz
crawl-ref-3a5353d8d400c14f7bf1d01a28340877662e6165.zip
Apply trunk r6855 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6856 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/describe.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 3fc9ab53a6..72d603a09f 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3045,8 +3045,11 @@ void describe_god( god_type which_god, bool give_title )
god_protects_from_harm(which_god, false))
{
int prayer_prot = 0;
- if (you.religion == GOD_ELYVILON && you.piety > 30)
+ if ((hpt == HPT_PRAYING || hpt == HPT_PRAYING_PLUS_ANYTIME)
+ && you.piety >= piety_breakpoint(0))
+ {
prayer_prot = 100 - 3000/you.piety;
+ }
int prot_chance = 10 + you.piety/10 + prayer_prot; // chance * 100