Don't output inscriptions for DESC_PLAIN and DESC_BASENAME

descriptions.
Also remove reference to weapons of disruption.


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

1 files changed, 25 insertions, 22 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 6155950002..5298995774 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -231,30 +231,33 @@ std::string item_def::name(description_level_type descrip,
             buff << " (around neck)";
             equipped = true;
         }
-    }
-
-    const bool  tried     = (!ident && !equipped && item_type_tried(*this));
-    std::string tried_str = "";
-
-    if (tried)
-    {
-        item_type_id_state_type id_type =
-            get_ident_type(this->base_type, this->sub_type);
-        if (id_type == ID_MON_TRIED_TYPE)
-            tried_str = "tried by monster";
-        else
-            tried_str = "tried";
-    }
+   }
+   
+   if (descrip != DESC_PLAIN && descrip != DESC_BASENAME)
+   {
+        const bool  tried     = (!ident && !equipped && item_type_tried(*this));
+        std::string tried_str = "";
+
+        if (tried)
+        {
+            item_type_id_state_type id_type =
+                get_ident_type(this->base_type, this->sub_type);
+            if (id_type == ID_MON_TRIED_TYPE)
+                tried_str = "tried by monster";
+            else
+                tried_str = "tried";
+        }
 
-    if ( with_inscription && !(this->inscription.empty()) )
-    {
-        buff << " {";
-        if ( tried )
-            buff << tried_str << ", ";
-        buff << this->inscription << "}";
+        if ( with_inscription && !(this->inscription.empty()) )
+        {
+            buff << " {";
+            if ( tried )
+                buff << tried_str << ", ";
+            buff << this->inscription << "}";
+        }
+        else if ( tried )
+            buff << " {" << tried_str << "}";
     }
-    else if ( tried )
-        buff << " {" << tried_str << "}";
 
     return buff.str();
 }