From e6382da066816a596525d3f62d49aa7c9bba45ce Mon Sep 17 00:00:00 2001 From: dolorous Date: Tue, 14 Oct 2008 06:57:29 +0000 Subject: Consistency fixes: Ensure that Beoghits can't permanently recruit summoned orcs via the Crusade card, or beat shapeshifters in orc form into submission. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7246 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/monstuff.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 6868e2c1d1..80cfa15b96 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -587,8 +587,9 @@ static bool _monster_avoided_death(monsters *monster, killer_type killer, int i) if (you.religion == GOD_BEOGH && mons_species(monster->type) == MONS_ORC + && !mons_is_summoned(monster) && !mons_is_shapeshifter(monster) && !player_under_penance() && you.piety >= piety_breakpoint(2) - && mons_near(monster) && !mons_is_summoned(monster)) + && mons_near(monster)) { if (YOU_KILL(killer)) convert = true; -- cgit v1.2.3-54-g00ecf