summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/godwrath.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-02-17 00:16:28 +0000
committerChris Campbell <chriscampbell89@gmail.com>2014-02-17 00:18:05 +0000
commit940ad1f62137493e5a45b1d3c85fcebab3493548 (patch)
treefbdb425e8a6893d8be60e7dd5553fdb30e6d74d0 /crawl-ref/source/godwrath.cc
parentfc65818e666b68d1d57a2ca39021e185f406be2b (diff)
downloadcrawl-ref-940ad1f62137493e5a45b1d3c85fcebab3493548.tar.gz
crawl-ref-940ad1f62137493e5a45b1d3c85fcebab3493548.zip
Don't let Jiyva create hostile slimes while under penance
Since killing them will just result in more penance.
Diffstat (limited to 'crawl-ref/source/godwrath.cc')
-rw-r--r--crawl-ref/source/godwrath.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index 5a20c07fa7..613a94c2c3 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -1116,7 +1116,10 @@ static bool _jiyva_retribution()
for (int i = 0; i < mutat; ++i)
mutate(RANDOM_BAD_MUTATION, "Jiyva's wrath", true, false, true);
}
- else if (there_are_monsters_nearby() && coinflip())
+ // Don't create hostile slimes while under penance.
+ else if (!you_worship(GOD_JIYVA)
+ && there_are_monsters_nearby()
+ && coinflip())
{
int tries = 0;
bool found_one = false;
@@ -1147,7 +1150,7 @@ static bool _jiyva_retribution()
slimify_monster(mon, true);
}
}
- else if (!one_chance_in(3))
+ else if (!one_chance_in(3) || you_worship(GOD_JIYVA))
{
god_speaks(god, "Mutagenic energy floods into your body!");
contaminate_player(random2(you.penance[GOD_JIYVA] * 500));