fiddlerwoaroof/crawl - Change 4QKMTZSWYJYJ46HW2TXO6KBPJV4NPBXA4T3ZRRRDYZSAA77ULVZQC

Fix 1923913: blood spattering into fountains

Fix 1923487: jewelled helmets getting the "jewelled" randart description Fix 1923471: Suppress the beholding message if only attacking.

Also remove ARM_HELM since it's identical in every way with ARM_HELMET and only serves to confuse coders.

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

Created by j-p-e-g on March 24, 2008

4QKMTZSWYJYJ46HW2TXO6KBPJV4NPBXA4T3ZRRRDYZSAA77ULVZQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tile1.cc at line 3181 [5.96318]

B:BD[5.193670] → [5.193670:193816]

        // Why are there both helms and helmets? -Enne
        // It'd be like having catsup and ketchup in the same game.
        case ARM_HELM:

Deletion in crawl-ref/source/shopping.cc at line 905 [6.759950]
B:BD[6.781790] → [7.387:410]
```
        case ARM_HELM:
```

Replacement in crawl-ref/source/randart.cc at line 1217 [6.893152]

B:BD[4.9492] → [4.9492:9548]

        if (appear.empty()) // nothing found for lookup

[4.9492]

[4.9548]

        if (appear.empty() // nothing found for lookup
            // don't allow "jewelled jewelled helmet"
            || item.base_type == OBJ_ARMOUR
               && item.sub_type == ARM_HELMET
               && appear == "jewelled"
               && get_helmet_desc(item) == THELM_DESC_JEWELLED)

Insertion in crawl-ref/source/randart.cc at line 1228 [6.893152]
[4.9727]
[4.9727]
```
        
```

Insertion in crawl-ref/source/misc.cc at line 303 [6.1933596]

[2.5637]

        return (false);
    // no spattering into fountains
    if (grd[x][y] == DNGN_BLUE_FOUNTAIN || grd[x][y] == DNGN_SPARKLING_FOUNTAIN)

Deletion in crawl-ref/source/makeitem.cc at line 265 [9.927]
B:BD[8.899] → [7.1003:1024]
```
      case ARM_HELM:
```
Deletion in crawl-ref/source/makeitem.cc at line 308 [9.927]
B:BD[9.7619] → [7.1083:1102]
```
    case ARM_HELM:
```
Deletion in crawl-ref/source/makeitem.cc at line 1905 [9.927]
B:BD[7.1277] → [7.1277:1300]
```
        case ARM_HELM:
```
Deletion in crawl-ref/source/makeitem.cc at line 1981 [9.927]
B:BD[10.31530] → [7.1618:1637]
```
    case ARM_HELM:
```

Replacement in crawl-ref/source/makeitem.cc at line 4112 [9.927]

B:BD[11.48511] → [11.48511:48554]

B:BD[11.48554] → [7.2065:2127]

∅:D[7.2127] → [11.48554:48555]

B:BD[11.48554] → [11.48554:48555]

B:BD[11.48555] → [7.2128:2233]

∅:D[7.2233] → [11.48555:48615]

B:BD[11.48555] → [11.48555:48615]

        armtype = ARM_SHIELD + random2(5);
        if ( armtype > ARM_HELMET )
            armtype += 3;
        if ( armtype == ARM_HELMET && one_chance_in(3) )
            armtype = ARM_HELMET + random2(4);
        if (armtype == ARM_SHIELD)                 // 33.3%

[11.48511]

[11.48615]

        // same chance each
        switch (random2(5))
        {
        case 0:
            armtype = ARM_SHIELD;
            break;
        case 1:
            armtype = ARM_CLOAK;
            break;
        case 2:
            armtype = ARM_HELMET;
            break;
        case 3:
            armtype = ARM_GLOVES;
            break;
        case 4:
            armtype = ARM_BOOTS;
            break;
        }
        
        if (armtype == ARM_HELMET && one_chance_in(3))

Insertion in crawl-ref/source/makeitem.cc at line 4134 [9.927]

[11.48625]

            armtype = ARM_HELMET + random2(3);
        }
        else if (armtype == ARM_SHIELD)            // 33.3%
        {

Deletion in crawl-ref/source/itemprop.h at line 32 [12.641567]
B:BD[7.2321] → [7.2321:2335]
```
    ARM_HELM,
```

Deletion in crawl-ref/source/itemprop.cc at line 126 [12.646661]

B:BD[12.651823] → [7.2869:3000]

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

Replacement in crawl-ref/source/itemprop.cc at line 818 [12.646661]

B:BD[12.670824] → [12.670824:670865]

B:BD[12.670865] → [7.3537:3629]

    return (item.base_type == OBJ_ARMOUR
            && (item.sub_type == ARM_HELMET ||
                item.sub_type == ARM_HELM));

[12.670824]

[12.671020]

    return (item.base_type == OBJ_ARMOUR && item.sub_type == ARM_HELMET);

Insertion in crawl-ref/source/itemprop.cc at line 2403 [12.646661]
[12.706398]
[12.706398]
```
        
```
Deletion in crawl-ref/source/itemprop.cc at line 2408 [12.646661]
B:BD[12.706496] → [7.3888:3911]
```
        case ARM_HELM:
```

Replacement in crawl-ref/source/itemname.cc at line 1222 [6.2667494]

B:BD[7.4294] → [7.4294:4521]

            buff << 
                (
                    (dhelm == THELM_DESC_PLAIN)    ? "" :
                    (dhelm == THELM_DESC_WINGED)   ? "winged " :
                    (dhelm == THELM_DESC_HORNED)   ? "horned " :

[7.4294]

[7.4521]

            buff <<
                   ((dhelm == THELM_DESC_PLAIN)    ? "" :
                    (dhelm == THELM_DESC_WINGED)   ? "winged "  :
                    (dhelm == THELM_DESC_HORNED)   ? "horned "  :

Replacement in crawl-ref/source/itemname.cc at line 1227 [6.2667494]

B:BD[7.4587] → [7.4587:4717]

                    (dhelm == THELM_DESC_PLUMED)   ? "plumed " :
                    (dhelm == THELM_DESC_SPIKED)   ? "spiked " :

[7.4587]

[7.4717]

                    (dhelm == THELM_DESC_PLUMED)   ? "plumed "  :
                    (dhelm == THELM_DESC_SPIKED)   ? "spiked "  :

Replacement in crawl-ref/source/acr.cc at line 4170 [6.4397395]
B:BD[3.3123] → [3.3123:3146]
```
    else if (beholder)
```
[3.3123]
[3.3146]
```
    else if (beholder && !attacking)
```

Fix 1923913: blood spattering into fountains

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/tile1.cc at line 3181 [5.96318]

Deletion in crawl-ref/source/shopping.cc at line 905 [6.759950]

Replacement in crawl-ref/source/randart.cc at line 1217 [6.893152]

Insertion in crawl-ref/source/randart.cc at line 1228 [6.893152]

Insertion in crawl-ref/source/misc.cc at line 303 [6.1933596]

Deletion in crawl-ref/source/makeitem.cc at line 265 [9.927]

Deletion in crawl-ref/source/makeitem.cc at line 308 [9.927]

Deletion in crawl-ref/source/makeitem.cc at line 1905 [9.927]

Deletion in crawl-ref/source/makeitem.cc at line 1981 [9.927]

Replacement in crawl-ref/source/makeitem.cc at line 4112 [9.927]

Insertion in crawl-ref/source/makeitem.cc at line 4134 [9.927]

Deletion in crawl-ref/source/itemprop.h at line 32 [12.641567]

Deletion in crawl-ref/source/itemprop.cc at line 126 [12.646661]

Replacement in crawl-ref/source/itemprop.cc at line 818 [12.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2403 [12.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2408 [12.646661]

Replacement in crawl-ref/source/itemname.cc at line 1222 [6.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1227 [6.2667494]

Replacement in crawl-ref/source/acr.cc at line 4170 [6.4397395]