Show wand max charges in the inventory (coledot)

crawl · Dec 19, 2015 · c59c8fa · c59c8fa
1 parent 9229740
commit c59c8fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
@@ -1792,17 +1792,10 @@ string get_item_description(const item_def &item, bool verbose,
         }
 
 
-        if (item_type_known(item))
+        if (item_type_known(item) && !item_ident(item, ISFLAG_KNOW_PLUSES))
         {
-            const int max_charges = wand_max_charges(item);
-            if (item.charges < max_charges
-                || !item_ident(item, ISFLAG_KNOW_PLUSES))
-            {
-                description << "\nIt can have at most " << max_charges
-                            << " charges.";
-            }
-            else
-                description << "\nIt is fully charged.";
+            description << "\nIt can have at most " << wand_max_charges(item)
+                        << " charges.";
         }
 
         if (known_empty)

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
@@ -1767,7 +1767,7 @@ string item_def::name_aux(description_level_type desc, bool terse, bool ident,
         }
 
         if (know_pluses)
-            buff << " (" << charges << ")";
+            buff << " (" << charges << "/" << wand_max_charges(*this) << ")";
         else if (!dbname && with_inscription)
         {
             if (used_count == ZAPCOUNT_EMPTY)