Add various god gift-related cleanups.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5966 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 11 insertions, 17 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 61eb11b43f..c7c31cc632 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2487,31 +2487,25 @@ static void _crusade_card(int power, deck_rarity_type rarity)
             // (though not immunity) check. Specifically,
             // you can convert Killer Klowns this way.
             // Might be too good.
-            if ( monster->hit_dice * 35 < random2(power) )
+            if (monster->hit_dice * 35 < random2(power))
             {
-                bool converted = false;
+                simple_monster_message(monster, " is converted.");
 
-                if ( one_chance_in(5 - power_level) )
+                if (one_chance_in(5 - power_level))
                 {
-                    if (you.religion == GOD_BEOGH &&
-                        mons_species(monster->type) == MONS_ORC)
-                    {
-                        beogh_convert_orc(monster, false);
-                    }
-                    else
+                    monster->attitude = ATT_FRIENDLY;
+
+                    // If you worship a god that lets you recruit
+                    // permanent followers, count this as a recruitment.
+                    if (you.religion == GOD_SHINING_ONE
+                        || you.religion == GOD_BEOGH
+                            && mons_species(monster->type) == MONS_ORC)
                     {
-                        monster->attitude = ATT_FRIENDLY;
-                        converted = true;
+                        mons_make_god_gift(monster);
                     }
                 }
                 else
-                {
                     monster->add_ench(ENCH_CHARM);
-                    converted = true;
-                }
-
-                if (converted)
-                    simple_monster_message(monster, " is converted.");
             }
         }
     }