Nemelex no longer gifts mixed decks.

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

1 files changed, 15 insertions, 27 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index d7a14ec76f..7c27eebe25 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -633,35 +633,23 @@ static void give_nemelex_gift()
          && !you.attribute[ATTR_CARD_COUNTDOWN]))
     {
         misc_item_type gift_type;
-        if ( random2(MAX_PIETY) <= you.piety )
-        {
-            // make a pure deck
-            const misc_item_type pure_decks[] = {
-                MISC_DECK_OF_ESCAPE,
-                MISC_DECK_OF_DESTRUCTION,
-                MISC_DECK_OF_DUNGEONS,
-                MISC_DECK_OF_SUMMONING,
-                MISC_DECK_OF_WONDERS
-            };
-            int weights[5];
-            get_pure_deck_weights(weights);
-            const int choice = choose_random_weighted(weights, weights+5);
-            gift_type = pure_decks[choice];
+
+        // make a pure deck
+        const misc_item_type pure_decks[] = {
+            MISC_DECK_OF_ESCAPE,
+            MISC_DECK_OF_DESTRUCTION,
+            MISC_DECK_OF_DUNGEONS,
+            MISC_DECK_OF_SUMMONING,
+            MISC_DECK_OF_WONDERS
+        };
+        int weights[5];
+        get_pure_deck_weights(weights);
+        const int choice = choose_random_weighted(weights, weights+5);
+        gift_type = pure_decks[choice];
 #if DEBUG_GIFTS || DEBUG_CARDS
-            show_pure_deck_chances();
+        show_pure_deck_chances();
 #endif
-            update_sacrifice_weights(choice);
-        }
-        else
-        {
-            // make a mixed deck
-            const misc_item_type mixed_decks[] = {
-                MISC_DECK_OF_WAR,
-                MISC_DECK_OF_CHANGES,
-                MISC_DECK_OF_DEFENSE
-            };
-            gift_type = RANDOM_ELEMENT(mixed_decks);
-        }
+        update_sacrifice_weights(choice);
 
         int thing_created = items( 1, OBJ_MISCELLANY, gift_type, 
                                    true, 1, MAKE_ITEM_RANDOM_RACE );