Really fix all inconsistencies between orcs converted by Beoghites and

those converted by the Crusade card.  If you use the latter, but you 
worship Beogh, and the monster to be converted is an orc, call the Beogh 
conversion function instead.  This properly sets the MF_CREATED_FRIENDLY 
flag (so that, if you kill it, it will give no experience) and the 
MF_ATT_CHANGE_ATTEMPT flag (so that, if you attack it, it won't have any 
chance of being converted again by the sight of you).


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

1 files changed, 9 insertions, 1 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 7c5ba33f36..c2d87e8ca1 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2279,7 +2279,15 @@ static void crusade_card(int power, deck_rarity_type rarity)
             {
                 simple_monster_message(monster, " is converted.");
                 if ( one_chance_in(5 - power_level) )
-                    monster->attitude = ATT_FRIENDLY;
+                {
+                    if (you.religion == GOD_BEOGH &&
+                        mons_species(monster->type) == MONS_ORC)
+                    {
+                        beogh_convert_orc(monster, false);
+                    }
+                    else
+                        monster->attitude = ATT_FRIENDLY;
+                }
                 else
                     monster->add_ench(ENCH_CHARM);
             }