Remove caps; rename wizards hats "hats."

In the spirit of the glove/gauntlet and helmet types distinction removal, there
doesn't seem to be much reason to have both caps and wizard hats. Hats are more
common among unrands and wizards starting with hats is more "thematic" than
some gladiators starting with caps. on the other hand, those gladiators starting
with wizard hats would be pretty weird, so wizard hats are just hats now.

Caps not removed:
- Caps existing in old saves
- Summon cap
- Level cap

This changes the percentages of hat brands from 2/3 MR and 1/3 int to 1/3 MR,
1/3 int, and 1/3 spirit shield.

1 files changed, 5 insertions, 3 deletions

diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc
index e0e9749a7d..07b8fb960d 100644
--- a/crawl-ref/source/tilepick-p.cc
+++ b/crawl-ref/source/tilepick-p.cc
@@ -388,13 +388,15 @@ tileidx_t tilep_equ_helm(const item_def &item)
 
     switch (item.sub_type)
     {
+#if TAG_MAJOR_VERSION == 34
         case ARM_CAP:
             return _modrng(item.rnd, TILEP_HELM_CAP_FIRST_NORM,
                            TILEP_HELM_CAP_LAST_NORM);
 
-        case ARM_WIZARD_HAT:
-            return _modrng(item.rnd, TILEP_HELM_WHAT_FIRST_NORM,
-                           TILEP_HELM_WHAT_LAST_NORM);
+#endif
+        case ARM_HAT:
+            return _modrng(item.rnd, TILEP_HELM_HAT_FIRST_NORM,
+                           TILEP_HELM_HAT_LAST_NORM);
 
         case ARM_HELMET:
             return _modrng(item.rnd, TILEP_HELM_FIRST_NORM,