Helmets, helms, caps and wizard hats now have their own subtypes, as

opposed to the old model where they had subtype ARM_HELMET.
Breaks savefiles, might be buggy.


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

1 files changed, 6 insertions, 22 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 2013187ce3..fbc3be1a77 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1423,33 +1423,17 @@ static std::string describe_armour( const item_def &item, bool verbose )
 
     description.reserve(200);
 
-    if (verbose 
-            && item.sub_type != ARM_SHIELD 
-            && item.sub_type != ARM_BUCKLER
-            && item.sub_type != ARM_LARGE_SHIELD)
+    if (verbose
+        && item.sub_type != ARM_SHIELD 
+        && item.sub_type != ARM_BUCKLER
+        && item.sub_type != ARM_LARGE_SHIELD)
     {
         description += "$Armour rating: ";
-
-        if (item.sub_type == ARM_HELMET 
-            && (get_helmet_type( item ) == THELM_CAP 
-                || get_helmet_type( item ) == THELM_WIZARD_HAT))
-        {
-            // caps and wizard hats don't have a base AC
-            append_value(description, 0, false);
-        }
-        else if (item.sub_type == ARM_NAGA_BARDING 
-                || item.sub_type == ARM_CENTAUR_BARDING)
-        {
-            // Barding has AC value 4.
-            append_value(description, 4, false);
-        }
-        else
-        {
-            append_value(description, property( item, PARM_AC ), false);
-        }
+        append_value(description, property( item, PARM_AC ), false);
 
         description += "$Evasion modifier: ";
         append_value(description, property( item, PARM_EVASION ), true);
+
         description += "$";
     }