diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-14 06:57:29 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-14 06:57:29 +0000 |
| commit | e6382da066816a596525d3f62d49aa7c9bba45ce (patch) | |
| tree | d3c0348fcf2b2350ee34b0939481bd6b06dd391b /crawl-ref/source | |
| parent | b0726dc32d2f89a6b5cbc5d4a6d2f59e1961b051 (diff) | |
| download | crawl-ref-e6382da066816a596525d3f62d49aa7c9bba45ce.tar.gz crawl-ref-e6382da066816a596525d3f62d49aa7c9bba45ce.zip | |
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
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/decks.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index d4c41758c8..cf02cfa371 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -2493,6 +2493,7 @@ static void _crusade_card(int power, deck_rarity_type rarity) if (is_good_god(you.religion) || you.religion == GOD_BEOGH && mons_species(monster->type) == MONS_ORC + && !mons_is_summoned(monster) && !mons_is_shapeshifter(monster)) { mons_make_god_gift(monster, is_good_god(you.religion) ? 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; |