fiddlerwoaroof/crawl - Change 6GQU5BMORHTHJGGVYPGJZSEIHPOVXDAS23BE7OHU4X6WVDYRC2MAC

Fixed Enchant Weapon III message bug.

Pain brand can now be fixed (with a side effect of self-torment.)

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

Created by haranp on January 23, 2007

6GQU5BMORHTHJGGVYPGJZSEIHPOVXDAS23BE7OHU4X6WVDYRC2MAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1670 [3.293070]
B:BD[3.336330] → [3.336330:336397]
```
        if (you.is_undead || you.mutation[MUT_TORMENT_RESISTANCE])
```
[3.336330]
[3.336397]
```
        if (player_res_torment())
```
Replacement in crawl-ref/source/misc.cc at line 1082 [3.1933596]
B:BD[4.8271] → [2.202:237]
```
static char fix_colour(char incol)
```
[4.8271]
[4.8307]
```
static char fix_black_colour(char incol)
```

Replacement in crawl-ref/source/misc.cc at line 1092 [3.1933596]

B:BD[2.273] → [2.273:398]

    env.floor_colour = fix_colour(mcolour[env.mons_alloc[9]]);
    env.rock_colour = fix_colour(mcolour[env.mons_alloc[8]]);

[2.273]

[2.398]

    env.floor_colour = fix_black_colour(mcolour[env.mons_alloc[9]]);
    env.rock_colour = fix_black_colour(mcolour[env.mons_alloc[8]]);

Insertion in crawl-ref/source/item_use.cc at line 2858 [3.2781507]

[3.2851335]


    case SPWPN_PAIN:
        strcat(info, " shrieks out in eternal agony!");
        mpr(info);
        torment_monsters(you.x_pos, you.y_pos, 0, TORMENT_GENERIC);

Insertion in crawl-ref/source/item_use.cc at line 2865 [3.2781507]

[3.2851336]

        // is only naughty if you know you're doing it
        if (get_ident_type(OBJ_SCROLLS, SCR_ENCHANT_WEAPON_III)==ID_KNOWN_TYPE)
            did_god_conduct(DID_UNHOLY, 10);
        break;

Insertion in crawl-ref/source/item_use.cc at line 3397 [3.2781507]
[3.2864557]
[3.2864557]
```
            in_name( you.equip[EQ_WEAPON], DESC_CAP_YOUR, info );
```

Deletion in crawl-ref/source/item_use.cc at line 3400 [3.2781507]

B:BD[3.2864616] → [3.2864616:2864732]

                in_name( you.equip[EQ_WEAPON], DESC_CAP_YOUR, str_pass );
                strcpy( info, str_pass );