fiddlerwoaroof/crawl - Change 64VBM7SGUX7CVO5TMVOFU4A26BDOFQXKS6G5K7BXCSWKCCXEETOAC

Don't change beam names for tracers. (Fixes 1994978.)

Clean up the vampire ability screen a bit. Special case naga bardings of running (according to makeitem.cc they can exist) to be called "naga barding of speedy slithering" instead. Yes, it's a hack, and yes, the name is rather unwieldy, but it makes more sense this way. I hope. :p

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

Created by j-p-e-g on June 16, 2008

64VBM7SGUX7CVO5TMVOFU4A26BDOFQXKS6G5K7BXCSWKCCXEETOAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 2012 [4.962854]

B:BD[3.4154] → [3.4154:4261]

        // The deformed don't fit into body armour very well
        // (this includes nagas and centaurs)

[3.4154]

[5.7652]

        // The deformed don't fit into body armour very well.
        // (This includes nagas and centaurs.)

Replacement in crawl-ref/source/player.cc at line 2284 [4.962854]

B:BD[6.1061] → [6.1061:1132]

    // Some lesser armours have small penalties now (shields, barding)

[6.1061]

[6.1132]

    // Some lesser armours have small penalties now (shields, barding).

Replacement in crawl-ref/source/player.cc at line 2292 [4.962854]

B:BD[6.1315] → [6.1315:1383]

        // reducing penalty of larger shields for larger characters

[6.1315]

[6.1383]

        // Reducing penalty of larger shields for larger characters.

Replacement in crawl-ref/source/player.cc at line 2300 [4.962854]
B:BD[6.1528] → [6.1528:1567]
```
    // handle main body armour penalty
```
[6.1528]
[6.1567]
```
    // Handle main body armour penalty.
```
Replacement in crawl-ref/source/mutation.cc at line 1447 [4.1263003]
B:BD[7.3786] → [2.2826:2852]
```
    const int lines = 13;
```
[7.3786]
[2.2852]
```
    const int lines = 14;
```

Replacement in crawl-ref/source/mutation.cc at line 1453 [4.1263003]

B:BD[7.4048] → [8.2554:2662]

B:BD[8.2662] → [2.2888:3000]

                                //Alive          Full       Satiated       Thirsty   Near...      Bloodless
       {"Metabolism           ", "very fast  ", "fast    ", "fast      ",  "normal   ", "slow     ", "none  "},

[7.4048]

[7.4268]

                                //Alive          Full       Satiated      Thirsty   Near...      Bloodless
       {"Metabolism           ", "very fast  ", "fast    ", "fast      ", "normal   ", "slow     ", "none  "},

Replacement in crawl-ref/source/mutation.cc at line 1456 [4.1263003]

B:BD[7.4269] → [2.3001:3113]

       {"Regeneration         ", "very fast  ", "fast    ", "normal    ",  "normal   ", "slow     ", "none  "},

[7.4269]

[7.4379]

       {"Regeneration         ", "very fast  ", "fast    ", "normal    ", "normal   ", "slow     ", "none  "},

Replacement in crawl-ref/source/mutation.cc at line 1458 [4.1263003]

B:BD[7.4380] → [2.3114:3226]

       {"Poison resistance    ", "           ", "        ", "          ",  " +       ", " +       ", " +    "},

[7.4380]

[7.4491]

       {"Stealth boost        ", "none       ", "none    ", "none      ", "minor    ", "major    ", "large "},

Replacement in crawl-ref/source/mutation.cc at line 1460 [4.1263003]

B:BD[7.4492] → [2.3227:3339]

       {"Cold resistance      ", "           ", "        ", "          ",  " +       ", " +       ", " ++   "},

[7.4492]

[7.4603]

       {"Spell hunger         ", "full       ", "full    ", "full      ", "halved   ", "none     ", "none  "},
       {EOL EOL "<w>Resistances</w>" EOL
        "Poison resistance    ", "           ", "        ", "          ", " +       ", " +       ", " +    "},
       {"Cold resistance      ", "           ", "        ", "          ", " +       ", " +       ", " ++   "},

Replacement in crawl-ref/source/mutation.cc at line 1467 [4.1263003]

B:BD[7.4604] → [2.3340:3452]

       {"Negative resistance  ", "           ", "        ", "          ",  " +       ", " ++      ", " +++  "},

[7.4604]

[7.4715]

       {"Negative resistance  ", "           ", "        ", "          ", " +       ", " ++      ", " +++  "},

Replacement in crawl-ref/source/mutation.cc at line 1469 [4.1263003]

B:BD[7.4716] → [2.3453:3565]

       {"Torment resistance   ", "           ", "        ", "          ",  "         ", "         ", " +    "},

[7.4716]

[7.4827]

       {"Torment resistance   ", "           ", "        ", "          ", "         ", "         ", " +    "},

Replacement in crawl-ref/source/mutation.cc at line 1471 [4.1263003]

B:BD[7.4828] → [2.3566:3678]

       {"Mutation chance      ", "always     ", "often   ", "sometimes ",  "never    ", "never    ", "never "},

[7.4828]

[9.2698]

       {EOL EOL "<w>Other effects</w>" EOL
        "Mutation chance      ", "always     ", "often   ", "sometimes ", "never    ", "never    ", "never "},

Replacement in crawl-ref/source/mutation.cc at line 1475 [4.1263003]

B:BD[2.3707] → [2.3707:3819]

        "mutation effects     ", "full       ", "capped  ", "capped    ",  "none     ", "none     ", "none  "},

[2.3707]

[2.3819]

        "mutation effects     ", "full       ", "capped  ", "capped    ", "none     ", "none     ", "none  "},

Replacement in crawl-ref/source/mutation.cc at line 1477 [4.1263003]

B:BD[2.3820] → [2.3820:3932]

∅:D[2.3932] → [7.4939:4940]

B:BD[7.4939] → [7.4939:4940]

B:BD[7.4940] → [2.3933:4045]

       {"Potion effects       ", "full       ", "full    ", "full      ",  "halved   ", "halved   ", "halved"},
       {"Bat Form             ", "no         ", "no      ", "yes       ",  "yes      ", "yes      ", "yes   "},

[2.3820]

[9.2811]

       {"Potion effects       ", "full       ", "full    ", "full      ", "halved   ", "halved   ", "halved"},

Replacement in crawl-ref/source/mutation.cc at line 1479 [4.1263003]

B:BD[9.2812] → [2.4046:4158]

       {"Stealth boost        ", "none       ", "none    ", "none      ",  "minor    ", "major    ", "large "},

[9.2812]

[10.3975]

       {"Bat Form             ", "no         ", "no      ", "yes       ", "yes      ", "yes      ", "yes   "},

Replacement in crawl-ref/source/mutation.cc at line 1481 [4.1263003]

B:BD[10.3976] → [2.4159:4270]

       {"Spell hunger         ", "full       ", "full    ", "full      ",  "halved   ", "none     ", "none  "}

[10.3976]

[7.5050]

       {"Other transformation " EOL
        "or going berserk     ", "yes        ", "yes     ", "no        ", "no       ", "no       ", "no    "}

Replacement in crawl-ref/source/makeitem.cc at line 4016 [12.927]
B:BD[11.247] → [11.247:286]
```
    // centaurs sometimes wear barding
```
[11.247]
[11.286]
```
    // Centaurs sometimes wear barding.
```

Replacement in crawl-ref/source/makeitem.cc at line 4028 [12.927]

B:BD[11.790] → [11.790:843]

            mitm[bp].sub_type = ARM_CENTAUR_BARDING;

[11.790]

[11.843]

            mitm[bp].sub_type  = ARM_CENTAUR_BARDING;

Replacement in crawl-ref/source/makeitem.cc at line 4043 [12.927]

B:BD[13.882] → [13.882:932]

            mitm[bp].sub_type = ARM_NAGA_BARDING;

[13.882]

[13.932]

            mitm[bp].sub_type  = ARM_NAGA_BARDING;

Replacement in crawl-ref/source/makeitem.cc at line 4048 [12.927]
B:BD[13.1066] → [13.1066:1108]
```
            mitm[bp].sub_type = ARM_ROBE;
```
[13.1066]
[13.1108]
```
            mitm[bp].sub_type  = ARM_ROBE;
```

Replacement in crawl-ref/source/itemprop.cc at line 1298 [14.646661]

B:BD[14.682268] → [14.682268:682338]

        // Note: some transformation include all of the above as well

[14.682268]

[14.682338]

        // Note: Some transformations include all of the above as well.

Replacement in crawl-ref/source/itemprop.cc at line 1576 [14.646661]

B:BD[14.688083] → [15.3660:3725]

    case OBJ_ARMOUR:    // barding and body armours are unwieldy

[14.688083]

[14.688149]

    case OBJ_ARMOUR:    // Bardings and body armours are unwieldy.

Replacement in crawl-ref/source/itemprop.cc at line 2585 [14.646661]
B:BD[14.706774] → [14.706774:706827]
```
        default:        // body armours and bardings
```
[14.706774]
[14.706827]
```
        default:        // Body armours and bardings.
```

Replacement in crawl-ref/source/itemprop.cc at line 2644 [14.646661]

B:BD[14.708100] → [14.708100:708140]

B:BD[14.708140] → [16.4771:4821]

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

[14.708100]

[14.708275]

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

Replacement in crawl-ref/source/itemname.cc at line 217 [4.2667494]

B:BD[17.10700] → [17.10700:10975]

                || this->link == you.equip[EQ_HELMET]
                || this->link == you.equip[EQ_GLOVES]
                || this->link == you.equip[EQ_BOOTS]
                || this->link == you.equip[EQ_SHIELD]
                || this->link == you.equip[EQ_BODY_ARMOUR])

[17.10700]

[4.2681657]

                 || this->link == you.equip[EQ_HELMET]
                 || this->link == you.equip[EQ_GLOVES]
                 || this->link == you.equip[EQ_BOOTS]
                 || this->link == you.equip[EQ_SHIELD]
                 || this->link == you.equip[EQ_BODY_ARMOUR])

Replacement in crawl-ref/source/itemname.cc at line 1248 [4.2667494]
B:BD[4.2698992] → [18.30297:30327]
```
                if ( !terse )
```
[4.2698992]
[18.30327]
```
                if (!terse)
```

Replacement in crawl-ref/source/itemname.cc at line 1250 [4.2667494]

B:BD[18.30363] → [18.30363:30418]

                buff << armour_ego_name(sparm, terse);

[18.30363]

[4.2700351]


                // "naga barding of running" doesn't make any sense, and yes,
                // they are possible.
                if (sub_type == ARM_NAGA_BARDING && sparm == SPARM_RUNNING)
                    buff << (terse ? "speed" : "speedy slithering");
                else
                    buff << armour_ego_name(sparm, terse);

Replacement in crawl-ref/source/effects.cc at line 1005 [4.3382105]
B:BD[4.3400654] → [4.3400654:3400704]
```
        // some species specific fitting problems
```
[4.3400395]
[4.3400704]
```
        // Some species specific fitting problems.
```
Insertion in crawl-ref/source/describe.cc at line 1921 [4.3736416]
[19.919]
[20.2189]
```
    else if (getch() == 0)
        getch();
```

Replacement in crawl-ref/source/beam.cc at line 5101 [4.4128068]

B:BD[4.4249410] → [4.4249410:4249413]

B:BD[4.4249413] → [21.4403:4476]

∅:D[21.4476] → [4.4249493:4249632]

B:BD[4.4249493] → [4.4249493:4249632]

/*
   Takes a bolt and refines it for use in the explosion function. Called
   from missile() and beam() in beam.cc. Explosions which do not follow from
   beams (eg scrolls of immolation) bypass this function.
 */

[4.4249410]

[22.19694]

// Takes a bolt and refines it for use in the explosion function. Called
// from missile() and beam() in beam.cc. Explosions which do not follow from
// beams (eg scrolls of immolation) bypass this function.

Replacement in crawl-ref/source/beam.cc at line 5110 [4.4128068]
B:BD[4.4249773] → [4.4249773:4249804]
```
    const char *seeMsg = NULL;
```
[4.4249773]
[4.4249804]
```
    const char *seeMsg  = NULL;
```

Replacement in crawl-ref/source/beam.cc at line 5113 [4.4128068]

B:BD[4.4249837] → [4.4249837:4249898]

    // assume that the player can see/hear the explosion, or

[4.4249837]

[4.4249898]

    // Assume that the player can see/hear the explosion, or

Replacement in crawl-ref/source/beam.cc at line 5191 [4.4128068]
∅:D[23.40725] → [14.1252729:1252768]
B:BD[4.4252138] → [14.1252729:1252768]
```
        pbolt.name = "stinking cloud";
```
[23.40725]
[4.4252189]
```
        if (!pbolt.is_tracer)
            pbolt.name = "stinking cloud";
```
Replacement in crawl-ref/source/beam.cc at line 5199 [4.4128068]
∅:D[23.40818] → [14.1252802:1252832]
B:BD[4.4252336] → [14.1252802:1252832]
```
        pbolt.name = "cloud";
```
[23.40818]
[4.4252378]
```
        if (!pbolt.is_tracer)
            pbolt.name = "cloud";
```

Replacement in crawl-ref/source/beam.cc at line 5231 [4.4128068]

B:BD[4.4253050] → [4.4253050:4253118]

// explosion is considered to emanate from beam->target_x, target_y

[4.4253050]

[4.4253118]

// explosion() is considered to emanate from beam->target_x, target_y

Replacement in crawl-ref/source/beam.cc at line 5234 [4.4128068]
∅:D[14.1253017] → [4.4253252:4253318]
B:BD[4.4253252] → [4.4253252:4253318]
```
// for each cell affected by the explosion, affect() is called.
```
[14.1253017]
[24.905]
```
//
// For each cell affected by the explosion, affect() is called.
```