fiddlerwoaroof/crawl - Change MNYDF64QY6NHYKOAFOGBQJFYU7TZDILXRV23EXJPN4IZOCLSJ2AQC

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

Created by haranp on December 10, 2007

MNYDF64QY6NHYKOAFOGBQJFYU7TZDILXRV23EXJPN4IZOCLSJ2AQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/unrand.h at line 342 [9.114533]

B:BD[9.124774] → [9.124774:124832]

        OBJ_ARMOUR, ARM_HELMET, +3, THELM_SPECIAL, BROWN,

[9.124774]

[9.124832]

        OBJ_ARMOUR, ARM_HELMET, +3, 0, BROWN,

Replacement in crawl-ref/source/unrand.h at line 896 [9.114533]
B:BD[9.137059] → [9.137059:137116]
```
        OBJ_ARMOUR, ARM_HELMET, +0, THELM_SPECIAL, BLUE,
```
[9.137059]
[9.137116]
```
        OBJ_ARMOUR, ARM_CAP, +0, 0, BLUE,
```

Replacement in crawl-ref/source/unrand.h at line 1060 [9.114533]

B:BD[9.140666] → [2.12:75]

        OBJ_ARMOUR, ARM_HELMET, +2, THELM_WIZARD_HAT, MAGENTA,

[9.140666]

[9.140726]

        OBJ_ARMOUR, ARM_WIZARD_HAT, +2, 0, MAGENTA,

Replacement in crawl-ref/source/tutorial.cc at line 1696 [11.5936]

B:BD[10.2737] → [10.2737:2942]

            else if (you.species == SP_MINOTAUR && item.sub_type == ARM_HELMET
                     && get_helmet_type(item) != THELM_CAP
                     && get_helmet_type(item) != THELM_WIZARD_HAT)

[10.2737]

[10.2942]

            else if (you.species == SP_MINOTAUR && is_hard_helmet(item))

Deletion in crawl-ref/source/tags.cc at line 1621 [9.164589]

B:BD[12.4033] → [12.4033:4223]

    // [dshaligram] FIXME, remove this kludge when ARM_CAP is fully
    // integrated.
    if (item.base_type == OBJ_ARMOUR && item.sub_type == ARM_CAP)
        item.sub_type = ARM_HELMET;

Insertion in crawl-ref/source/shopping.cc at line 896 [9.759950]

[9.781790]

        case ARM_HELM:
        case ARM_CAP:
        case ARM_WIZARD_HAT:

Replacement in crawl-ref/source/player.cc at line 1742 [9.962854]
B:BD[9.989773] → [9.989773:989813]
```
        const int item = you.equip[i]; 
```
[9.989773]
[9.989813]
```
        if ( i == EQ_SHIELD )
            continue;
```
Replacement in crawl-ref/source/player.cc at line 1745 [9.962854]
B:BD[9.989814] → [9.989814:989856]
```
        if (item == -1 || i == EQ_SHIELD)
```
[9.989814]
[9.989856]
```
        if ( you.equip[i] == -1 )
```
Replacement in crawl-ref/source/player.cc at line 1748 [9.962854]
B:BD[9.989879] → [4.170:212]
```
        AC += you.inv[ item ].plus * 100;
```
[9.989879]
[9.989915]
```
        const item_def& item = you.inv[you.equip[i]];
```

Replacement in crawl-ref/source/player.cc at line 1750 [9.962854]

B:BD[9.989916] → [9.989916:990131]

B:BD[9.990131] → [13.346585:346790]

∅:D[13.346790] → [9.990336:990378]

B:BD[9.990336] → [9.990336:990378]

        // Note that helms and boots have a sub-sub classing system
        // which uses "plus2"... since not all members have the same
        // AC value, we use special cases. -- bwr
        if (i == EQ_HELMET 
            && (get_helmet_type(you.inv[ item ]) == THELM_CAP
                || get_helmet_type(you.inv[ item ]) == THELM_WIZARD_HAT
                || get_helmet_type(you.inv[ item ]) == THELM_SPECIAL))
        {
            continue;
        }

[9.989916]

[9.990378]

        AC += item.plus * 100;

Replacement in crawl-ref/source/player.cc at line 1754 [9.962854]

∅:D[3.253] → [9.990644:990721]

B:BD[9.990644] → [9.990644:990721]

B:BD[9.990721] → [4.213:286]

        const unsigned long armour_race = get_equip_race( you.inv[ item ] );
        const int ac_value = property( you.inv[ item ], PARM_AC ) * 100;

[3.253]

[9.990788]

        const unsigned long armour_race = get_equip_race(item);
        const int ac_value = property(item, PARM_AC ) * 100;

Replacement in crawl-ref/source/mutation.cc at line 1807 [9.1263003]

B:BD[13.395665] → [14.9006:9172]

                (get_helmet_type(you.inv[you.equip[EQ_HELMET]]) == THELM_CAP ||
                 get_helmet_type(you.inv[you.equip[EQ_HELMET]]) == THELM_WIZARD_HAT))

[13.395665]

[9.1311144]

                (you.inv[you.equip[EQ_HELMET]].sub_type == ARM_CAP ||
                 you.inv[you.equip[EQ_HELMET]].sub_type == ARM_WIZARD_HAT))

Insertion in crawl-ref/source/makeitem.cc at line 260 [17.927]
[15.835]
[16.261]
```
      case ARM_WIZARD_HAT:
```

Replacement in crawl-ref/source/makeitem.cc at line 264 [17.927]

B:BD[17.6555] → [17.6555:6670]

B:BD[17.6670] → [16.293:328]

B:BD[16.328] → [8.235:245]

∅:D[8.245] → [17.6733:6782]

B:BD[17.6733] → [17.6733:6782]

        if (get_helmet_type(item) == THELM_CAP
            || get_helmet_type(item) == THELM_WIZARD_HAT)
        {
            item_colour = MAGENTA;
        }
        else
            item_colour = DARKGREY;

[15.899]

[17.6782]

      case ARM_HELM:
        item_colour = DARKGREY;

Deletion in crawl-ref/source/makeitem.cc at line 267 [17.927]
B:BD[17.6797] → [17.6797:6798]
Insertion in crawl-ref/source/makeitem.cc at line 303 [17.927]
[17.7565]
[17.7565]
```
    case ARM_WIZARD_HAT:
```
Replacement in crawl-ref/source/makeitem.cc at line 306 [17.927]
B:BD[17.7619] → [17.7619:7620]
[17.7619]
[17.7620]
```
    case ARM_HELM:
```

Replacement in crawl-ref/source/makeitem.cc at line 308 [17.927]

B:BD[17.7641] → [17.7641:7914]

        // caps and wizard's hats are random coloured
        if (get_helmet_type(item) == THELM_CAP
            || get_helmet_type(item) == THELM_WIZARD_HAT)
        {
            item_colour = random_colour();
        } 
        else
            item_colour = LIGHTCYAN;

[17.7641]

[17.7914]

        item_colour = LIGHTCYAN;

Deletion in crawl-ref/source/makeitem.cc at line 310 [17.927]
B:BD[17.7929] → [17.7929:7930]
Deletion in crawl-ref/source/makeitem.cc at line 1819 [17.927]
B:BD[17.65227] → [18.27487:27630]
∅:D[18.27630] → [17.65550:65551]
B:BD[17.65550] → [17.65550:65551]
B:BD[17.65551] → [18.27631:27718]
∅:D[18.27718] → [17.66188:66189]
B:BD[17.66188] → [17.66188:66189]
B:BD[17.66189] → [18.27719:27787]
∅:D[18.27787] → [17.66338:66339]
B:BD[17.66338] → [17.66338:66339]
```
static void determine_helmet_types(item_def& item)
{
    set_helmet_type( item, THELM_HELMET );
    set_helmet_desc( item, THELM_DESC_PLAIN );
    if (one_chance_in(3))
        set_helmet_type( item, random2( THELM_NUM_TYPES ) );
    if (one_chance_in(3))
        set_helmet_random_desc( item );
}
```

Insertion in crawl-ref/source/makeitem.cc at line 1873 [17.927]

[17.67844]

[18.29232]

        case ARM_CAP:
        case ARM_WIZARD_HAT:
            if (one_chance_in(6))
                rc = ISFLAG_ELVEN;
            break;
        case ARM_HELM:

Replacement in crawl-ref/source/makeitem.cc at line 1881 [17.927]

B:BD[18.29257] → [18.29257:29370]

∅:D[18.29370] → [17.68088:68102]

B:BD[17.68088] → [17.68088:68102]

B:BD[17.68102] → [18.29371:29701]

            if (get_helmet_type(item) == THELM_CAP
                || get_helmet_type(item) == THELM_WIZARD_HAT)
            {
                if (one_chance_in(6))
                    rc = ISFLAG_ELVEN;
            }
            else
            {
                // helms and helmets
                if (one_chance_in(8))
                    rc = ISFLAG_ORCISH;
                if (one_chance_in(6))
                    rc = ISFLAG_DWARVEN;
            }

[18.29257]

[18.29701]

            if (one_chance_in(8))
                rc = ISFLAG_ORCISH;
            if (one_chance_in(6))
                rc = ISFLAG_DWARVEN;

Insertion in crawl-ref/source/makeitem.cc at line 1944 [17.927]

[18.31508]

[17.71183]


    case ARM_WIZARD_HAT:
        if ( coinflip() )      
            rc = (one_chance_in(3) ?
                  SPARM_MAGIC_RESISTANCE : SPARM_INTELLIGENCE);
        break;

Replacement in crawl-ref/source/makeitem.cc at line 1952 [17.927]

B:BD[18.31530] → [18.31530:31801]

        if (get_helmet_type(item) == THELM_WIZARD_HAT && coinflip())
        {
            rc = one_chance_in(3) ?
                SPARM_MAGIC_RESISTANCE : SPARM_INTELLIGENCE;
        }
        else
            rc = coinflip() ? SPARM_SEE_INVISIBLE : SPARM_INTELLIGENCE;

[18.31530]

[18.31801]

    case ARM_HELM:
    case ARM_CAP:
        rc = coinflip() ? SPARM_SEE_INVISIBLE : SPARM_INTELLIGENCE;

Replacement in crawl-ref/source/makeitem.cc at line 2027 [17.927]

B:BD[17.77907] → [18.33726:33801]

    if (item.sub_type == ARM_HELMET)
        determine_helmet_types(item);

[17.77907]

[19.233]

    if ( is_helmet(item) && one_chance_in(3) )
        set_helmet_random_desc(item);

Replacement in crawl-ref/source/makeitem.cc at line 2046 [17.927]

B:BD[17.78076] → [18.34314:34435]

    if (force_good || (item.sub_type == ARM_HELMET 
                       && get_helmet_type(item) == THELM_WIZARD_HAT)

[17.78076]

[18.34435]

    if (force_good || item.sub_type == ARM_WIZARD_HAT

Replacement in crawl-ref/source/makeitem.cc at line 4045 [17.927]
B:BD[20.48073] → [20.48073:48103]
```
        armtype = random2(8);
```
[20.48073]
[20.48103]
```
        armtype = random2(ARM_SHIELD); // body armour of some kind
```

Replacement in crawl-ref/source/makeitem.cc at line 4048 [17.927]

B:BD[20.48166] → [20.48166:48214]

        armtype = ARM_DRAGON_HIDE + random2(7);

[20.48166]

[20.48214]

        armtype = ARM_DRAGON_HIDE + random2(7); // (ice) dragon/troll/crystal

Insertion in crawl-ref/source/makeitem.cc at line 4052 [17.927]
[20.48283]
[20.48283]
```
        // other dragon hides/armour or animal skin
```

Insertion in crawl-ref/source/makeitem.cc at line 4063 [17.927]

[20.48554]

        if ( armtype > ARM_HELMET )
            armtype += 3;

Insertion in crawl-ref/source/makeitem.cc at line 4066 [17.927]

[20.48555]

        if ( armtype == ARM_HELMET && one_chance_in(3) )
            armtype = ARM_HELMET + random2(4);

Deletion in crawl-ref/source/items.cc at line 3069 [9.2584728]

B:BD[21.144963] → [21.144963:145496]


    if (base_type == OBJ_ARMOUR) 
    {
        if (name.find("wizard's hat") != std::string::npos)
        {
            item.sub_type = ARM_HELMET;
            item.plus2 = THELM_WIZARD_HAT;
        }
        else if (name == "cap") // Don't search - too many possible collisions
        {
            item.sub_type = ARM_HELMET;
            item.plus2 = THELM_CAP;
        }
        else if (name == "helm")  // Don't search.
        {
            item.sub_type = ARM_HELMET;
            item.plus2 = THELM_HELM;
        }
    }

Deletion in crawl-ref/source/items.cc at line 3070 [9.2584728]
B:BD[21.145497] → [21.145497:145558]
```
    if (item.sub_type != OBJ_RANDOM)
        return (true);
```
Replacement in crawl-ref/source/itemprop.h at line 19 [13.641567]
B:BD[22.74246] → [22.74246:74293]
```
    ARM_ROBE,                          //    0
```
[22.74246]
[22.74293]
```
    ARM_ROBE,
```
Replacement in crawl-ref/source/itemprop.h at line 24 [13.641567]
B:BD[22.74376] → [22.74376:74423]
```
    ARM_SPLINT_MAIL,                   //    5
```
[22.74376]
[22.74423]
```
    ARM_SPLINT_MAIL,
```

Replacement in crawl-ref/source/itemprop.h at line 29 [13.641567]

B:BD[22.74495] → [22.74495:74542]

    ARM_HELMET,                        //   10

[22.74495]

[22.74542]

    ARM_HELMET,
    ARM_HELM,
    ARM_CAP,
    ARM_WIZARD_HAT,

Replacement in crawl-ref/source/itemprop.h at line 37 [13.641567]
B:BD[22.74612] → [22.74612:74659]
```
    ARM_DRAGON_HIDE,                   //   15
```
[22.74612]
[22.74659]
```
    ARM_DRAGON_HIDE,
```
Replacement in crawl-ref/source/itemprop.h at line 42 [13.641567]
B:BD[22.74760] → [22.74760:74807]
```
    ARM_ICE_DRAGON_HIDE,               //   20
```
[22.74760]
[22.74807]
```
    ARM_ICE_DRAGON_HIDE,
```
Replacement in crawl-ref/source/itemprop.h at line 47 [13.641567]
B:BD[22.74919] → [22.74919:74966]
```
    ARM_MOTTLED_DRAGON_ARMOUR,         //   25
```
[22.74919]
[22.74966]
```
    ARM_MOTTLED_DRAGON_ARMOUR,
```
Replacement in crawl-ref/source/itemprop.h at line 52 [13.641567]
B:BD[22.75076] → [22.75076:75123]
```
    ARM_ANIMAL_SKIN,                   //   30
```
[22.75076]
[22.75123]
```
    ARM_ANIMAL_SKIN,
```
Replacement in crawl-ref/source/itemprop.h at line 56 [13.641567]
B:BD[22.75211] → [22.75211:75271]
```
    ARM_CAP,
    ARM_CENTAUR_BARDING,               //   35
```
[22.75211]
[22.75271]
```
    ARM_CENTAUR_BARDING,
```
Replacement in crawl-ref/source/itemprop.h at line 147 [13.641567]
B:BD[22.77276] → [22.77276:77293]
```
enum helmet_type
```
[22.77276]
[22.77293]
```
enum helmet_desc_type
```

Replacement in crawl-ref/source/itemprop.h at line 149 [13.641567]

B:BD[22.77295] → [22.77295:77881]

    THELM_HELMET        = 0x0000,
    THELM_HELM          = 0x0001,
    THELM_CAP           = 0x0002,
    THELM_WIZARD_HAT    = 0x0003,
    THELM_NUM_TYPES     = 4,
    THELM_SPECIAL       = 0x0004,  // type used only for artefacts (mask, hat)
    THELM_TYPE_MASK     = 0x00ff,
    THELM_DESC_PLAIN    = 0x0000,
    THELM_DESC_WINGED   = 0x0100,
    THELM_DESC_HORNED   = 0x0200,
    THELM_DESC_CRESTED  = 0x0300,
    THELM_DESC_PLUMED   = 0x0400,
    THELM_DESC_SPIKED   = 0x0500,
    THELM_DESC_VISORED  = 0x0600,
    THELM_DESC_JEWELLED = 0x0700,
    THELM_DESC_MASK     = 0xff00

[22.77295]

[22.77881]

    THELM_DESC_PLAIN    = 0,
    THELM_DESC_WINGED,
    THELM_DESC_HORNED,
    THELM_DESC_CRESTED,
    THELM_DESC_PLUMED,
    THELM_DESC_MAX_SOFT = THELM_DESC_PLUMED,
    THELM_DESC_SPIKED,
    THELM_DESC_VISORED,
    THELM_DESC_JEWELLED,
    THELM_NUM_DESCS

Deletion in crawl-ref/source/itemprop.h at line 590 [13.641567]
B:BD[13.642581] → [13.642581:642635]
```
void  set_helmet_type( item_def &item, short flags );
```
Deletion in crawl-ref/source/itemprop.h at line 593 [13.641567]
B:BD[13.642738] → [13.642738:642785]
```
short get_helmet_type( const item_def &item );
```

Replacement in crawl-ref/source/itemprop.h at line 595 [13.641567]

B:BD[13.642833] → [13.642833:642890]

bool  is_helmet_type( const item_def &item, short val );

[13.642833]

[13.642890]

bool  is_helmet( const item_def& item );
bool  is_hard_helmet( const item_def& item );

Insertion in crawl-ref/source/itemprop.cc at line 128 [13.646661]

[13.651823]

        false, EQ_HELMET,      SIZE_SMALL,  SIZE_MEDIUM },
    { ARM_HELM,                 "helm",                   1,  0,   80,

Insertion in crawl-ref/source/itemprop.cc at line 131 [13.646661]
[13.651882]
[13.651882]

Insertion in crawl-ref/source/itemprop.cc at line 133 [13.646661]

[13.651954]

        true,  EQ_HELMET,      SIZE_LITTLE, SIZE_LARGE },
    { ARM_WIZARD_HAT,           "wizard hat",             0,  0,   40,

Deletion in crawl-ref/source/itemprop.cc at line 754 [13.646661]

B:BD[13.669416] → [13.669416:669608]

short get_helmet_type( const item_def &item )
{
    ASSERT( item.base_type == OBJ_ARMOUR 
            && get_armour_slot( item ) == EQ_HELMET );
    return (item.plus2 & THELM_TYPE_MASK);
}

Replacement in crawl-ref/source/itemprop.cc at line 759 [13.646661]
B:BD[13.669754] → [13.669754:669797]
```
    return (item.plus2 & THELM_DESC_MASK);
```
[13.669754]
[13.669797]
```
    return item.plus2;
```
Replacement in crawl-ref/source/itemprop.cc at line 762 [13.646661]
B:BD[13.669800] → [13.669800:669851]
```
void set_helmet_type( item_def &item, short type )
```
[13.669800]
[13.669851]
```
void set_helmet_desc( item_def &item, helmet_desc_type type )
```

Replacement in crawl-ref/source/itemprop.cc at line 764 [13.646661]

B:BD[13.669853] → [13.669853:669996]

    ASSERT( (type & ~THELM_TYPE_MASK) == 0 );
    ASSERT( item.base_type == OBJ_ARMOUR 
            && get_armour_slot( item ) == EQ_HELMET );

[13.669853]

[13.669996]

    ASSERT( is_helmet(item) );

Replacement in crawl-ref/source/itemprop.cc at line 766 [13.646661]

B:BD[13.669997] → [13.669997:670159]

B:BD[13.670159] → [23.2576:2618]

    // make sure we have the right sub_type (to get properties correctly)
    if (type == THELM_HELMET || type == THELM_HELM)
        item.sub_type = ARM_HELMET;
    else
        item.sub_type = ARM_CAP;

[13.669997]

[13.670159]

    if ((item.sub_type == ARM_CAP || item.sub_type == ARM_WIZARD_HAT)
        && type > THELM_DESC_PLUMED)
        type = THELM_DESC_PLAIN;

Replacement in crawl-ref/source/itemprop.cc at line 770 [13.646661]
B:BD[13.670267] → [13.670267:670328]
```
    item.plus2 &= ~THELM_TYPE_MASK; 
    item.plus2 |= type;
```
[13.670160]
[13.670328]
```
    item.plus2 = type;
```
Replacement in crawl-ref/source/itemprop.cc at line 773 [13.646661]
B:BD[13.670331] → [13.670331:670382]
```
void set_helmet_desc( item_def &item, short type )
```
[13.670331]
[13.670382]
```
bool is_helmet(const item_def& item)
```

Replacement in crawl-ref/source/itemprop.cc at line 775 [13.646661]

B:BD[13.670384] → [13.670384:670777]

    ASSERT( (type & ~THELM_DESC_MASK) == 0 );
    ASSERT( item.base_type == OBJ_ARMOUR 
            && get_armour_slot( item ) == EQ_HELMET );
    const int helmtype = get_helmet_type(item);
    if ((helmtype == THELM_CAP || helmtype == THELM_WIZARD_HAT) 
            && type > THELM_DESC_PLUMED)
        type = THELM_DESC_PLAIN;
    item.plus2 &= ~THELM_DESC_MASK; 
    item.plus2 |= type;

[13.670384]

[13.670777]

    return item.base_type == OBJ_ARMOUR && get_armour_slot(item) == EQ_HELMET;

Replacement in crawl-ref/source/itemprop.cc at line 781 [13.646661]

B:BD[13.670865] → [13.670865:671020]

            && item.sub_type == ARM_HELMET
            && (get_helmet_type(item) == THELM_HELM
                || get_helmet_type(item) == THELM_HELMET));

[13.670865]

[13.671020]

            && (item.sub_type == ARM_HELMET ||
                item.sub_type == ARM_HELM));

Replacement in crawl-ref/source/itemprop.cc at line 787 [13.646661]

B:BD[13.671071] → [13.671071:671168]

    ASSERT( item.base_type == OBJ_ARMOUR 
            && get_armour_slot( item ) == EQ_HELMET );

[13.671071]

[13.671168]

    ASSERT( is_helmet(item) );

Deletion in crawl-ref/source/itemprop.cc at line 789 [13.646661]
B:BD[13.671169] → [13.671169:671207]
```
    item.plus2 &= ~THELM_DESC_MASK; 
```
Replacement in crawl-ref/source/itemprop.cc at line 790 [13.646661]
B:BD[13.671237] → [13.671237:671278]
```
        item.plus2 |= (random2(8) << 8);
```
[13.671237]
[13.671278]
```
        item.plus2 = random2(THELM_NUM_DESCS);
```

Replacement in crawl-ref/source/itemprop.cc at line 792 [13.646661]

B:BD[13.671288] → [13.671288:671538]

        item.plus2 |= (random2(5) << 8);
}
bool is_helmet_type( const item_def &item, short val )
{
    if (item.base_type != OBJ_ARMOUR || get_armour_slot( item ) != EQ_HELMET)
        return (false);
    return (get_helmet_type( item ) == val);

[13.671288]

[13.671538]

        item.plus2 = random2(THELM_DESC_MAX_SOFT + 1);

Deletion in crawl-ref/source/itemprop.cc at line 975 [13.646661]
B:BD[13.675681] → [13.675681:675699]
```
    case ARM_CAP:
```
Insertion in crawl-ref/source/itemprop.cc at line 980 [13.646661]
[13.675851]
[13.675851]
```
    case ARM_CAP:
    case ARM_WIZARD_HAT:
```

Deletion in crawl-ref/source/itemprop.cc at line 983 [13.646661]

B:BD[13.675874] → [13.675874:676060]


    case ARM_HELMET:
    {
        const int helmtype = get_helmet_type(item);
        return (helmtype == THELM_CAP || helmtype == THELM_WIZARD_HAT);
    }
    default:
        break;

Replacement in crawl-ref/source/itemprop.cc at line 1161 [13.646661]

B:BD[13.680607] → [13.680607:680772]

            if (item.sub_type == ARM_CAP
                    || get_helmet_type(item) == THELM_CAP
                    || get_helmet_type(item) == THELM_WIZARD_HAT)

[13.680607]

[13.680772]

            if (item.sub_type == ARM_CAP || item.sub_type == ARM_WIZARD_HAT)

Insertion in crawl-ref/source/itemprop.cc at line 2301 [13.646661]
[13.706496]
[13.706496]
```
        case ARM_HELM:
```
Insertion in crawl-ref/source/itemprop.cc at line 2303 [13.646661]
[13.706518]
[13.706518]
```
        case ARM_WIZARD_HAT:
```
Insertion in crawl-ref/source/itemprop.cc at line 2307 [13.646661]
[13.706595]
[13.706595]
```
            size = SIZE_TINY;
```

Replacement in crawl-ref/source/itemprop.cc at line 2378 [13.646661]

B:BD[13.708140] → [13.708140:708275]

        && (item.sub_type == ARM_SHIELD
            || item.sub_type == ARM_BUCKLER
            || item.sub_type == ARM_LARGE_SHIELD);

[13.708140]

[13.708275]

        && get_armour_slot(item) == EQ_SHIELD;

Replacement in crawl-ref/source/itemprop.cc at line 2404 [13.646661]

B:BD[24.6068] → [23.2619:2690]

∅:D[23.2690] → [25.1034:1175]

B:BD[25.1034] → [25.1034:1175]

B:BD[25.1175] → [23.2691:2692]

∅:D[23.2692] → [25.2008:2420]

B:BD[25.2008] → [25.2008:2420]

        if ( item.sub_type != ARM_HELMET && item.sub_type != ARM_CAP )
        {
            return Armour_prop[Armour_index[item.sub_type]].name;
        }
        else
        {
            std::string result;
            const short helm_type = get_helmet_type( item );
            if (helm_type == THELM_HELM)
                result += "helm";
            else if (helm_type == THELM_CAP)
                result += "cap";
            else if (helm_type == THELM_WIZARD_HAT)
                result += "wizard's hat";
            else 
                result += "helmet";
            
            return result;
        }

[24.6068]

[24.6205]

        return Armour_prop[Armour_index[item.sub_type]].name;

Replacement in crawl-ref/source/itemname.cc at line 1167 [9.2667494]

B:BD[6.493] → [6.493:682]

                    || (item_typ == ARM_HELMET &&
                        (get_helmet_type( *this ) == THELM_CAP ||
                         get_helmet_type( *this ) == THELM_WIZARD_HAT)))

[6.493]

[9.2696113]

                    || (item_typ == ARM_CAP || item_typ == ARM_WIZARD_HAT))

Replacement in crawl-ref/source/itemname.cc at line 1198 [9.2667494]

B:BD[23.4279] → [23.4279:4339]

        if (!basename && !dbname && sub_type == ARM_HELMET)

[23.4279]

[23.4339]

        if (!basename && !dbname && is_hard_helmet(*this))

Replacement in crawl-ref/source/itemname.cc at line 1200 [9.2667494]

B:BD[23.4349] → [23.4349:5231]

            if (get_helmet_type(*this) == THELM_HELM ||
                get_helmet_type(*this) == THELM_HELMET) 
            {
                const short dhelm = get_helmet_desc( *this );
                
                buff << 
                    (
                        (dhelm == THELM_DESC_PLAIN)    ? "" :
                        (dhelm == THELM_DESC_WINGED)   ? "winged " :
                        (dhelm == THELM_DESC_HORNED)   ? "horned " :
                        (dhelm == THELM_DESC_CRESTED)  ? "crested " :
                        (dhelm == THELM_DESC_PLUMED)   ? "plumed " :
                        (dhelm == THELM_DESC_SPIKED)   ? "spiked " :
                        (dhelm == THELM_DESC_VISORED)  ? "visored " :
                        (dhelm == THELM_DESC_JEWELLED) ? "jewelled "
                                                       : "buggy ");
            }

[23.4349]

[26.5023]

            const short dhelm = get_helmet_desc( *this );
            
            buff << 
                (
                    (dhelm == THELM_DESC_PLAIN)    ? "" :
                    (dhelm == THELM_DESC_WINGED)   ? "winged " :
                    (dhelm == THELM_DESC_HORNED)   ? "horned " :
                    (dhelm == THELM_DESC_CRESTED)  ? "crested " :
                    (dhelm == THELM_DESC_PLUMED)   ? "plumed " :
                    (dhelm == THELM_DESC_SPIKED)   ? "spiked " :
                    (dhelm == THELM_DESC_VISORED)  ? "visored " :
                    (dhelm == THELM_DESC_JEWELLED) ? "jewelled "
                                                   : "buggy ");

Deletion in crawl-ref/source/itemname.cc at line 2202 [9.2667494]

B:BD[23.8337] → [23.8337:8363]

B:BD[23.8463] → [23.8463:8643]

                continue;
            else if (item.base_type == OBJ_ARMOUR
                     && get_armour_slot( item ) == EQ_HELMET)
            {
                // Why do we handle helmets this way?

Deletion in crawl-ref/source/itemname.cc at line 2203 [9.2667494]
B:BD[23.8669] → [23.8669:8683]
```
            }
```

Deletion in crawl-ref/source/itemname.cc at line 2219 [9.2667494]

B:BD[23.9208] → [23.9208:10141]

B:BD[23.10141] → [7.308:335]


    int o = items(0, OBJ_ARMOUR, ARM_HELMET, true, 1,
                  MAKE_ITEM_NO_RACE);
    if (o == NON_ITEM)
    {
        crawl_state.add_startup_error("Couldn't cache helmet names.");
        return;
    }
    item_def &item(mitm[o]);
    // Make sure item isn't an artifact
    item.flags  &= ~ISFLAG_ARTEFACT_MASK;
    item.special = 0;
    // Now handle the helmets
    for (int i = 0; i < THELM_NUM_TYPES; i++)
    {
        set_helmet_type(item, i);
        item_types_pair pair = {item.base_type, item.sub_type};
        std::string    name = item.name(DESC_DBNAME, true, true);
        unsigned       glyph;
        unsigned short colour;
        get_item_glyph(&item, &glyph, &colour);
        lowercase(name);
        if (item_names_cache.find(name) == item_names_cache.end())
        {
            item_names_cache[name] = pair;
            item_names_by_glyph_cache[glyph].push_back(name);
        }
    }
    destroy_item(o, true);

Replacement in crawl-ref/source/item_use.cc at line 848 [9.2781507]

B:BD[9.2800664] → [13.735661:735697]

B:BD[13.735697] → [5.1868:1984]

    else if (sub_type == ARM_HELMET
             && (get_helmet_type(item) == THELM_CAP
                 || get_helmet_type(item) == THELM_WIZARD_HAT))

[9.2800664]

[9.2800848]

    else if (sub_type == ARM_CAP || sub_type == ARM_WIZARD_HAT)

Replacement in crawl-ref/source/item_use.cc at line 882 [9.2781507]

B:BD[13.736153] → [13.736153:736192]

B:BD[13.736192] → [5.2202:2322]

            || (sub_type == ARM_HELMET
                && (get_helmet_type(item) == THELM_HELM
                    || get_helmet_type(item) == THELM_HELMET)))

[13.736153]

[9.2801958]

            || is_hard_helmet(item))

Replacement in crawl-ref/source/item_use.cc at line 901 [9.2781507]

B:BD[13.736617] → [13.736617:736656]

B:BD[13.736656] → [5.2349:2469]

            || (sub_type == ARM_HELMET
                && (get_helmet_type(item) == THELM_HELM
                    || get_helmet_type(item) == THELM_HELMET)))

[13.736617]

[9.2802746]

            || is_hard_helmet(item))

Replacement in crawl-ref/source/fight.cc at line 773 [9.3140790]

B:BD[27.37291] → [27.37291:37503]

            if (you.equip[EQ_HELMET] != -1
                && (get_helmet_type(you.inv[you.equip[EQ_HELMET]]) == THELM_HELMET
                    || get_helmet_type(you.inv[you.equip[EQ_HELMET]]) == THELM_HELM))

[27.37291]

[27.37503]

            if (you.equip[EQ_HELMET] != -1)

Replacement in crawl-ref/source/fight.cc at line 775 [9.3140790]

B:BD[27.37517] → [27.37517:37731]

                aux_damage += 2;
                if (get_helmet_desc(you.inv[you.equip[EQ_HELMET]]) == THELM_DESC_SPIKED
                    || get_helmet_desc(you.inv[you.equip[EQ_HELMET]]) == THELM_DESC_HORNED)

[27.37517]

[27.37731]

                const item_def& helmet = you.inv[you.equip[EQ_HELMET]];
                if ( is_hard_helmet(helmet) )

Replacement in crawl-ref/source/fight.cc at line 778 [9.3140790]

B:BD[27.37749] → [27.37749:37786]

                    aux_damage += 3;

[27.37749]

[27.37786]

                    aux_damage += 2;
                    if (get_helmet_desc(helmet) == THELM_DESC_SPIKED
                        || get_helmet_desc(helmet) == THELM_DESC_HORNED)
                    {
                        aux_damage += 3;
                    }

Replacement in crawl-ref/source/describe.cc at line 1426 [9.3736416]

B:BD[9.3787381] → [13.985885:985902]

∅:D[13.985902] → [9.3787403:3787541]

B:BD[9.3787403] → [9.3787403:3787541]

    if (verbose 
            && item.sub_type != ARM_SHIELD 
            && item.sub_type != ARM_BUCKLER
            && item.sub_type != ARM_LARGE_SHIELD)

[9.3787332]

[9.3787541]

    if (verbose
        && item.sub_type != ARM_SHIELD 
        && item.sub_type != ARM_BUCKLER
        && item.sub_type != ARM_LARGE_SHIELD)

Replacement in crawl-ref/source/describe.cc at line 1432 [9.3736416]

B:BD[9.3787590] → [9.3787590:3787877]

B:BD[9.3787877] → [13.985903:986012]

∅:D[13.986012] → [9.3787951:3788165]

B:BD[9.3787951] → [9.3787951:3788165]


        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);
        }

[9.3787590]

[9.3788165]

        append_value(description, property( item, PARM_AC ), false);

Insertion in crawl-ref/source/describe.cc at line 1436 [9.3736416]
[9.3788285]
[9.3788285]

Deletion in crawl-ref/source/debug.cc at line 1105 [9.4016436]

B:BD[28.6370] → [28.6370:6416]

∅:D[28.6416] → [9.4037834:4037907]

B:BD[9.4037834] → [9.4037834:4037907]

B:BD[9.4037907] → [13.1025096:1025161]

∅:D[13.1025161] → [9.4038029:4038114]

B:BD[9.4038029] → [9.4038029:4038114]

B:BD[9.4038114] → [13.1025162:1025230]

∅:D[13.1025230] → [9.4038239:4038842]

B:BD[9.4038239] → [9.4038239:4038842]

        else if (class_wanted == OBJ_ARMOUR) 
        {
            if (strstr( "naga barding", specs ))
            {
                mitm[thing_created].sub_type = ARM_NAGA_BARDING;
            }
            else if (strstr( "centaur barding", specs ))
            {
                mitm[thing_created].sub_type = ARM_CENTAUR_BARDING;
            }
            else if (strstr( "wizard's hat", specs ))
            {
                mitm[thing_created].sub_type = ARM_HELMET;
                mitm[thing_created].plus2 = THELM_WIZARD_HAT;
            }
            else if (strstr( "cap", specs ))
            {
                mitm[thing_created].sub_type = ARM_HELMET;
                mitm[thing_created].plus2 = THELM_CAP;
            }
            else if (strstr( "helm", specs ))
            {
                mitm[thing_created].sub_type = ARM_HELMET;
                mitm[thing_created].plus2 = THELM_HELM;
            }
        }

Deletion in crawl-ref/source/debug.cc at line 1598 [9.4016436]
B:BD[9.4056134] → [9.4056134:4056193]
```
                        && mitm[i].sub_type != ARM_HELMET 
```

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

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/unrand.h at line 342 [9.114533]

Replacement in crawl-ref/source/unrand.h at line 896 [9.114533]

Replacement in crawl-ref/source/unrand.h at line 1060 [9.114533]

Replacement in crawl-ref/source/tutorial.cc at line 1696 [11.5936]

Deletion in crawl-ref/source/tags.cc at line 1621 [9.164589]

Insertion in crawl-ref/source/shopping.cc at line 896 [9.759950]

Replacement in crawl-ref/source/player.cc at line 1742 [9.962854]

Replacement in crawl-ref/source/player.cc at line 1745 [9.962854]

Replacement in crawl-ref/source/player.cc at line 1748 [9.962854]

Replacement in crawl-ref/source/player.cc at line 1750 [9.962854]

Replacement in crawl-ref/source/player.cc at line 1754 [9.962854]

Replacement in crawl-ref/source/mutation.cc at line 1807 [9.1263003]

Insertion in crawl-ref/source/makeitem.cc at line 260 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 264 [17.927]

Deletion in crawl-ref/source/makeitem.cc at line 267 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 303 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 306 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 308 [17.927]

Deletion in crawl-ref/source/makeitem.cc at line 310 [17.927]

Deletion in crawl-ref/source/makeitem.cc at line 1819 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 1873 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1881 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 1944 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1952 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 2027 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 2046 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 4045 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 4048 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 4052 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 4063 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 4066 [17.927]

Deletion in crawl-ref/source/items.cc at line 3069 [9.2584728]

Deletion in crawl-ref/source/items.cc at line 3070 [9.2584728]

Replacement in crawl-ref/source/itemprop.h at line 19 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 24 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 29 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 37 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 42 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 47 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 52 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 56 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 147 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 149 [13.641567]

Deletion in crawl-ref/source/itemprop.h at line 590 [13.641567]

Deletion in crawl-ref/source/itemprop.h at line 593 [13.641567]

Replacement in crawl-ref/source/itemprop.h at line 595 [13.641567]

Insertion in crawl-ref/source/itemprop.cc at line 128 [13.646661]

Insertion in crawl-ref/source/itemprop.cc at line 131 [13.646661]

Insertion in crawl-ref/source/itemprop.cc at line 133 [13.646661]

Deletion in crawl-ref/source/itemprop.cc at line 754 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 759 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 762 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 764 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 766 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 770 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 773 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 775 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 781 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 787 [13.646661]

Deletion in crawl-ref/source/itemprop.cc at line 789 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 790 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 792 [13.646661]

Deletion in crawl-ref/source/itemprop.cc at line 975 [13.646661]

Insertion in crawl-ref/source/itemprop.cc at line 980 [13.646661]

Deletion in crawl-ref/source/itemprop.cc at line 983 [13.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1161 [13.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2301 [13.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2303 [13.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2307 [13.646661]