summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-24 18:08:39 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-24 18:08:39 +0000
commit6054a9251a852b63fc2e16cf628a09c9640417c3 (patch)
tree74bc2e4118b9177beaccc100a7e6d926c3bbd552
parente996bc6663cf4ec69b4c8d01dfad3d4e9ef08788 (diff)
downloadcrawl-ref-6054a9251a852b63fc2e16cf628a09c9640417c3.tar.gz
crawl-ref-6054a9251a852b63fc2e16cf628a09c9640417c3.zip
Trunk->0.3 merge (2904): You should only get the saving throw for losing
orcish followers if you're under penance, not if you've abandoned Beogh. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2911 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/religion.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 37e25dee7f..5f3c68956e 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2494,7 +2494,8 @@ bool followers_abandon_you()
const int hd = monster->hit_dice;
// during penance followers get a saving throw
- if (random2((you.piety-you.penance[GOD_BEOGH])/18) +
+ if (you.religion == GOD_BEOGH &&
+ random2((you.piety-you.penance[GOD_BEOGH])/18) +
random2(you.skills[SK_INVOCATIONS]-6)
> random2(hd) + hd + random2(5))
{