summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/decks.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-26 05:08:59 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-26 05:08:59 +0000
commitfe3687d403177eacbfd69a1eaadfccbc7f681a27 (patch)
treec53de87843b4c538186acdd1872bdd404fe2a1d8 /crawl-ref/source/decks.cc
parent6a4ba1f08f5c5e0c33cf3b62b28028f94f49a73f (diff)
downloadcrawl-ref-fe3687d403177eacbfd69a1eaadfccbc7f681a27.tar.gz
crawl-ref-fe3687d403177eacbfd69a1eaadfccbc7f681a27.zip
don't allow shapeshifters in orc form to become Beoghites' followers via
the Crusade card, either. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7007 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
-rw-r--r--crawl-ref/source/decks.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 8ba664fb9e..ff0e6a2af8 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2491,7 +2491,7 @@ static void _crusade_card(int power, deck_rarity_type rarity)
}
// Note that this bypasses the magic resistance
- // (though not immunity) check. Specifically,
+ // (though not immunity) check. Specifically,
// you can convert Killer Klowns this way.
// Might be too good.
if (monster->hit_dice * 35 < random2(power))
@@ -2507,7 +2507,8 @@ static void _crusade_card(int power, deck_rarity_type rarity)
// count this as a recruitment.
if (is_good_god(you.religion)
|| you.religion == GOD_BEOGH
- && mons_species(monster->type) == MONS_ORC)
+ && mons_species(monster->type) == MONS_ORC
+ && !mons_is_shapeshifter(monster))
{
mons_make_god_gift(monster, is_good_god(you.religion) ?
GOD_SHINING_ONE : GOD_BEOGH);