fiddlerwoaroof/crawl - Change KBBSDMAXAGEDFMIVL6BSPMMSOBZKWPJTFCLBGCHRLE5DGTVAACSAC

Applying several patches by dolorous:

1789774: intrinsic mutations for undead
1790380: kobold special handling of disease
1790723: missing periods
1791092: Xom potion handling

It's arguable whether we want such fine distinction between races. As David pointed out, small things of lesser importance might clutter the mutations screen. For now, I think transparency is good. And if it seems to much, we could remove a few.

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

Created by j-p-e-g on September 10, 2007

KBBSDMAXAGEDFMIVL6BSPMMSOBZKWPJTFCLBGCHRLE5DGTVAACSAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 2708 [6.293070]
B:BD[2.21530] → [2.21530:21618]
∅:D[2.21618] → [6.371432:371455]
B:BD[6.371432] → [6.371432:371455]
B:BD[6.371455] → [2.21619:21633]
∅:D[2.21633] → [6.371455:371456]
B:BD[6.371455] → [6.371455:371456]
```
            if (you.is_undead)
            {
                mpr("You feel terrible.");
                break;
            }
```
Replacement in crawl-ref/source/player.h at line 397 [6.945993]
B:BD[6.962260] → [6.962260:962319]
```
void confuse_player( int amount, bool resistable = true );
```
[6.962260]
[6.962319]
```
bool confuse_player( int amount, bool resistable = true );
```
Replacement in crawl-ref/source/player.h at line 400 [6.945993]
B:BD[6.962362] → [6.962362:962394]
```
void slow_player( int amount );
```
[6.962362]
[6.962394]
```
bool slow_player( int amount );
```
Replacement in crawl-ref/source/player.h at line 410 [6.945993]
B:BD[6.962541] → [6.962541:962572]
```
void rot_player( int amount );
```
[6.962541]
[7.197510]
```
bool rot_player( int amount );
```

Replacement in crawl-ref/source/player.cc at line 1232 [6.962854]

B:BD[8.346450] → [8.346450:346518]

    return (you.is_undead || you.mutation[MUT_TORMENT_RESISTANCE]);

[8.346450]

[8.346518]

    return (you.mutation[MUT_TORMENT_RESISTANCE]);

Deletion in crawl-ref/source/player.cc at line 1475 [6.962854]
B:BD[9.5152] → [9.5152:5209]
∅:D[9.5209] → [6.985658:985675]
B:BD[6.985658] → [6.985658:985675]
```
    else if (you.is_undead && you.species != SP_VAMPIRE)
        pl += 3;
```
Replacement in crawl-ref/source/player.cc at line 1497 [6.962854]
B:BD[6.986004] → [6.986004:986025]
```
    // demonic power
```
[6.986004]
[6.986025]
```
    // undead/demonic power
```
Replacement in crawl-ref/source/player.cc at line 3353 [6.962854]
B:BD[9.6842] → [9.6842:6881]
```
        mpr("You do not regenerate.");
```
[9.6842]
[9.6881]
```
        mpr("You do not heal.");
```
Replacement in crawl-ref/source/player.cc at line 4521 [6.962854]
B:BD[6.1064397] → [6.1064397:1064448]
```
void confuse_player( int amount, bool resistable )
```
[6.1064397]
[6.1064448]
```
bool confuse_player( int amount, bool resistable )
```
Replacement in crawl-ref/source/player.cc at line 4524 [6.962854]
B:BD[6.1064471] → [6.1064471:1064487]
```
        return;
```
[6.1064471]
[6.1064487]
```
        return false;
```
Replacement in crawl-ref/source/player.cc at line 4529 [6.962854]
B:BD[6.1064594] → [6.1064594:1064610]
```
        return;
```
[6.1064594]
[6.1064610]
```
        return false;
```
Insertion in crawl-ref/source/player.cc at line 4546 [6.962854]
[6.1064956]
[6.1064956]
```
    return true;
```
Replacement in crawl-ref/source/player.cc at line 4563 [6.962854]
B:BD[6.1065184] → [6.1065184:1065215]
```
void slow_player( int amount )
```
[6.1065184]
[6.1065215]
```
bool slow_player( int amount )
```
Replacement in crawl-ref/source/player.cc at line 4566 [6.962854]
B:BD[6.1065238] → [6.1065238:1065254]
```
        return;
```
[6.1065238]
[6.1065254]
```
        return false;
```
Insertion in crawl-ref/source/player.cc at line 4569 [6.962854]
[6.1065298]
[6.1065298]
```
    {
```
Insertion in crawl-ref/source/player.cc at line 4571 [6.962854]
[6.1065346]
[10.6703]
```
        return false;
    }
```
Insertion in crawl-ref/source/player.cc at line 4588 [6.962854]
[6.1065702]
[6.1065702]
```
    return true;
```
Insertion in crawl-ref/source/player.cc at line 4673 [6.962854]
[6.1067652]
[6.1067652]
```
        // kobolds and regenerators recuperate quickly
```
Replacement in crawl-ref/source/player.cc at line 4687 [6.962854]
B:BD[6.1068002] → [6.1068002:1068032]
```
void rot_player( int amount )
```
[6.1068002]
[6.1068032]
```
bool rot_player( int amount )
```

Replacement in crawl-ref/source/player.cc at line 4690 [6.962854]

B:BD[6.1068055] → [6.1068055:1068071]

        return;

[6.1068055]

[6.1068071]

        return false;
    if (you.is_undead)
    {
        mpr( "You feel terrible." );
        return false;
    }

Insertion in crawl-ref/source/player.cc at line 4707 [6.962854]
[3.449]
[3.449]
```
    return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1928 [6.1132300]
[11.1060]
[11.1060]
```
        you.mutation[MUT_TORMENT_RESISTANCE] = 1;
```
Insertion in crawl-ref/source/newgame.cc at line 1931 [6.1132300]
[11.1206]
[11.1254]
```
        you.mutation[MUT_NEGATIVE_ENERGY_RESISTANCE] = 3;
```
Insertion in crawl-ref/source/newgame.cc at line 1937 [6.1132300]
[11.1401]
[11.1401]
```
        you.mutation[MUT_TORMENT_RESISTANCE] = 1;
```
Insertion in crawl-ref/source/newgame.cc at line 1940 [6.1132300]
[11.1547]
[12.63]
```
        you.mutation[MUT_NEGATIVE_ENERGY_RESISTANCE] = 3;
```
Insertion in crawl-ref/source/newgame.cc at line 1953 [6.1132300]
[9.9269]
[13.244]
```
        you.mutation[MUT_TORMENT_RESISTANCE] = 1;
```

Replacement in crawl-ref/source/mutation.cc at line 405 [6.1263003]

B:BD[6.1277412] → [6.1277412:1277511]

    {"You feel less intelligent.", "You feel less intelligent",
     "You feel less intelligent"},

[6.1277412]

[6.1277511]

    {"You feel less intelligent.", "You feel less intelligent.",
     "You feel less intelligent."},

Replacement in crawl-ref/source/mutation.cc at line 970 [6.1263003]
B:BD[14.2786] → [15.2868:2921]
```
        result += "You resist negative energy." EOL;
```
[14.2786]
[16.2121]
```
        result += "You heal slowly." EOL;
```

Replacement in crawl-ref/source/mutation.cc at line 1010 [6.1263003]

B:BD[16.2734] → [15.2922:2975]

        result += "You resist negative energy." EOL;

[16.2734]

[6.1296754]

        result += "Your flesh is vulnerable to fire." EOL;

Insertion in crawl-ref/source/mutation.cc at line 1092 [6.1263003]
[17.271]
[17.271]
```
        result += "You recuperate from illness quickly." EOL;
```

Replacement in crawl-ref/source/mutation.cc at line 1110 [6.1263003]

B:BD[15.3254] → [15.3254:3318]

            result += "You mostly resist negative energy." EOL;

[15.3254]

[15.3318]

            result += "You are quite resistant to negative energy." EOL;

Replacement in crawl-ref/source/mutation.cc at line 1114 [6.1263003]

B:BD[15.3618] → [5.229:447]

        result += "<green>";
        if (you.hunger_state < HS_HUNGRY)
            result += "You do not regenerate." EOL;
        else
            result += "You regenerate slowly." EOL;
        result += "</green>";

[15.3618]

[5.447]

        if (you.hunger_state == HS_FULL)
            result += "<green>Your natural rate of healing is unusually fast.</green>" EOL;
        else if (you.hunger_state == HS_HUNGRY)
            result += "<green>You heal slowly.</green>" EOL;
        else if (you.hunger_state < HS_HUNGRY)
            result += "<green>You do not heal.</green>" EOL;

Replacement in crawl-ref/source/it_use2.cc at line 170 [6.2904329]

B:BD[6.2908430] → [4.3944:4037]

        slow_player( (10 + random2(pow)) / factor );
        xom_is_stimulated(64 / factor);

[6.2908430]

[6.2908472]

        if (slow_player((10 + random2(pow)) / factor))
            xom_is_stimulated(64 / factor);

Replacement in crawl-ref/source/it_use2.cc at line 180 [6.2904329]

B:BD[6.2908926] → [4.4038:4132]

        confuse_player( (3 + random2(8)) / factor );
        xom_is_stimulated(128 / factor);

[6.2908926]

[6.2908968]

        if (confuse_player((3 + random2(8)) / factor))
            xom_is_stimulated(128 / factor);

Replacement in crawl-ref/source/it_use2.cc at line 217 [6.2904329]

B:BD[6.2909686] → [6.2909686:2909740]

B:BD[6.2909740] → [18.51726:51757]

        lose_stat(STAT_RANDOM, 1 + random2avg(4, 2));
        xom_is_stimulated(64);

[6.2909686]

[6.2909740]

        if (lose_stat(STAT_RANDOM, 1 + random2avg(4, 2)))
            xom_is_stimulated(64);

Replacement in crawl-ref/source/it_use2.cc at line 223 [6.2904329]
B:BD[6.2909840] → [6.2909840:2909921]
B:BD[6.2909921] → [18.51758:51768]
∅:D[18.51768] → [6.2909921:2909965]
B:BD[6.2909921] → [6.2909921:2909965]
```
        if (you.is_undead)
            mpr( "You feel terrible." );
        else
        {
            rot_player( 10 + random2(10) );
```
[6.2909840]
[18.51769]
```
        if (rot_player(10 + random2(10)))
```
Deletion in crawl-ref/source/it_use2.cc at line 225 [6.2904329]
B:BD[18.51804] → [18.51804:51814]
```
        }
```

Replacement in crawl-ref/source/beam.cc at line 3251 [6.4128068]

B:BD[6.4229251] → [6.4229251:4229322]

            if (you.is_undead || you.mutation[MUT_TORMENT_RESISTANCE])

[6.4229251]

[6.4229322]

            if (player_res_torment())

Applying several patches by dolorous:

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 2708 [6.293070]

Replacement in crawl-ref/source/player.h at line 397 [6.945993]

Replacement in crawl-ref/source/player.h at line 400 [6.945993]

Replacement in crawl-ref/source/player.h at line 410 [6.945993]

Replacement in crawl-ref/source/player.cc at line 1232 [6.962854]

Deletion in crawl-ref/source/player.cc at line 1475 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1497 [6.962854]

Replacement in crawl-ref/source/player.cc at line 3353 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4521 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4524 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4529 [6.962854]

Insertion in crawl-ref/source/player.cc at line 4546 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4563 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4566 [6.962854]

Insertion in crawl-ref/source/player.cc at line 4569 [6.962854]

Insertion in crawl-ref/source/player.cc at line 4571 [6.962854]

Insertion in crawl-ref/source/player.cc at line 4588 [6.962854]

Insertion in crawl-ref/source/player.cc at line 4673 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4687 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4690 [6.962854]

Insertion in crawl-ref/source/player.cc at line 4707 [6.962854]

Insertion in crawl-ref/source/newgame.cc at line 1928 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1931 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1937 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1940 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1953 [6.1132300]

Replacement in crawl-ref/source/mutation.cc at line 405 [6.1263003]

Replacement in crawl-ref/source/mutation.cc at line 970 [6.1263003]