summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-08 22:13:43 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-08 22:13:43 +0000
commitc8e6f3b078150cc871ed73bc84a1e126f741bf98 (patch)
treeea9001cafc30de3aa50ec55de31b42f8aa5071fc /crawl-ref/source/monstuff.cc
parent85d53ad6b83dc723746a1b0ab00ebf05d98cb9c2 (diff)
downloadcrawl-ref-c8e6f3b078150cc871ed73bc84a1e126f741bf98.tar.gz
crawl-ref-c8e6f3b078150cc871ed73bc84a1e126f741bf98.zip
Make Elyvilon's healing of monsters consistent in the same way.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4152 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 36686b29a2..6624d695b1 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -511,8 +511,8 @@ static bool _ely_protects_ally(monsters *monster)
return (true);
}
-// Elyvilon retribution effect: heal hostile monsters that were about to
-// be killed by you or one of your friends
+// Elyvilon retribution effect: Heal hostile monsters that were about to
+// be killed by you or one of your friends.
static bool _ely_heals_monster(monsters *monster, killer_type killer, int i)
{
ASSERT(you.religion != GOD_ELYVILON);
@@ -523,13 +523,8 @@ static bool _ely_heals_monster(monsters *monster, killer_type killer, int i)
const int ely_penance = you.penance[god];
- if (mons_holiness(monster) != MH_NATURAL
- && mons_holiness(monster) != MH_HOLY
- || mons_friendly(monster)
- || !one_chance_in(10))
- {
+ if (mons_friendly(monster) || !one_chance_in(10))
return (false);
- }
if (MON_KILL(killer) && !invalid_monster_index(i))
{