From a5e9aa3d8d8543b80a113497c0cef9be0293f9c6 Mon Sep 17 00:00:00 2001
From: Steve Melenchuk <smelenchuk@gmail.com>
Date: Wed, 20 Jun 2012 13:19:47 -0600
Subject: [PATCH] Ignore item subtype checks for autopickup for artefacts with
 unknown base type.

This prevents autopickup from leaking information about the base type of
artefacts (in particular, rings and amulets); cf. Mantis 0005802.
---
 crawl-ref/source/items.cc |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 2027c51..b1a70fc 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2521,26 +2521,30 @@ static bool _is_option_autopickup(const item_def &item, std::string &iname)
     if (iname.empty())
         iname = _autopickup_item_name(item);
 
-    if (item.base_type < NUM_OBJECT_CLASSES)
-    {
-        int force = you.force_autopickup[item.base_type][item.sub_type];
-        if (force != 0)
-            return (force == 1);
-    }
 
-    //Check for initial settings
-    for (int i = 0; i < (int)Options.force_autopickup.size(); ++i)
-        if (Options.force_autopickup[i].first.matches(iname))
+    if (!is_artefact(item) || item_type_known(item))
+    {
+        if (item.base_type < NUM_OBJECT_CLASSES)
         {
-            bool r = Options.force_autopickup[i].second;
-            if (item.base_type < NUM_OBJECT_CLASSES)
-            {
-                int force = r ? 1 : -1;
-                you.force_autopickup[item.base_type][item.sub_type] = force;
-            }
-            return r;
+            int force = you.force_autopickup[item.base_type][item.sub_type];
+            if (force != 0)
+                return (force == 1);
         }
 
+        //Check for initial settings
+        for (int i = 0; i < (int)Options.force_autopickup.size(); ++i)
+            if (Options.force_autopickup[i].first.matches(iname))
+             {
+                 bool r = Options.force_autopickup[i].second;
+                 if (item.base_type < NUM_OBJECT_CLASSES)
+                 {
+                     int force = r ? 1 : -1;
+                     you.force_autopickup[item.base_type][item.sub_type] = force;
+                 }
+                 return r;
+             }
+    }
+
 #ifdef CLUA_BINDINGS
     bool res = clua.callbooleanfn(false, "ch_force_autopickup", "is",
                                         &item, iname.c_str());
-- 
1.7.8.6