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, 2 insertions, 2 deletions

diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index dc7372a66f..b1d981695b 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -548,7 +548,7 @@ static void _give_items_skills(const newgame_def& ng)
 
         newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR,
                            ARM_ANIMAL_SKIN);
-        newgame_make_item(2, EQ_HELMET, OBJ_ARMOUR, ARM_HELMET, ARM_CAP);
+        newgame_make_item(2, EQ_HELMET, OBJ_ARMOUR, ARM_HELMET, ARM_HAT);
         newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, -1, 3);
         autopickup_starting_ammo(MI_THROWING_NET);
 
@@ -741,7 +741,7 @@ static void _give_items_skills(const newgame_def& ng)
 
     case JOB_WIZARD:
         newgame_make_item(0, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE);
-        newgame_make_item(1, EQ_HELMET, OBJ_ARMOUR, ARM_WIZARD_HAT);
+        newgame_make_item(1, EQ_HELMET, OBJ_ARMOUR, ARM_HAT);
 
         newgame_make_item(2, EQ_NONE, OBJ_BOOKS, BOOK_MINOR_MAGIC);