Fix 1914059: randart jewellery inconsistently described as {tried} by

             adding yet another entry to props.

FR 1949504: Move version information into the help scroller, yay! It also
            looks much nicer now (if I may say so). Go, take a look! :)


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

1 files changed, 8 insertions, 7 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index f299dbc8d1..c44b0f88a6 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1707,17 +1707,18 @@ static bool _randart_has_known_property(const item_def &item)
 
 bool item_type_tried( const item_def& item )
 {
-    if ( item_type_known(item) )
-        return false;
+    if (item_type_known(item))
+        return (false);
 
-    if ( is_artefact(item) )
+    if (is_artefact(item) && item.base_type == OBJ_JEWELLERY)
     {
         if (item.base_type == OBJ_JEWELLERY
-            && _randart_has_known_property(item))
+            && item.props.exists("jewellery_tried")
+            && item.props["jewellery_tried"].get_bool())
         {
-            return true;
+            return (true);
         }
-        return false;
+        return (false);
     }
 
     const item_type_id_type idt = objtype_to_idtype(item.base_type);
@@ -1727,7 +1728,7 @@ bool item_type_tried( const item_def& item )
                  || type_ids[idt][item.sub_type] == ID_MON_TRIED_TYPE);
     }
     else
-        return false;
+        return (false);
 }
 
 id_arr& get_typeid_array()