fiddlerwoaroof/crawl - Change UCM6RM43UZHOSRI75MQQZPBTLQIV63N4KQ4V7N54ZZGQ7LCR6YGQC

Simplify mutation handling again, and add a message for when Zin's

mutation protection takes effect.

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

Created by dolorous on April 26, 2008

UCM6RM43UZHOSRI75MQQZPBTLQIV63N4KQ4V7N54ZZGQ7LCR6YGQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mutation.cc at line 1659 [5.1263003]

[2.2601]

[5.1300707]


    if (!force_mutation)
    {
        // God gifts override amulets of resist mutation.
        if ((wearing_amulet(AMU_RESIST_MUTATION)
                && !one_chance_in(10) && !god_gift)
            || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
            || player_mutation_level(MUT_MUTATION_RESISTANCE)
                && !one_chance_in(3))
        {
            mpr("You feel odd for a moment.", MSGCH_MUTATION);
            return false;
        }
        // Zin's protection.
        if (you.religion == GOD_ZIN && you.piety > random2(MAX_PIETY))
        {
            simple_god_message(" protects your body from chaos!");
            return false;
        }
    }

Replacement in crawl-ref/source/mutation.cc at line 1717 [5.1263003]
B:BD[6.610] → [7.20642:20674]
```
    if (rotting && !demonspawn)
```
[6.610]
[5.1300791]
```
    if (rotting && !demonspawn && !one_chance_in(3))
```

Replacement in crawl-ref/source/mutation.cc at line 1719 [5.1263003]

B:BD[5.1300797] → [3.2558:2616]

∅:D[3.2616] → [8.2959:3226]

∅:D[9.2620] → [8.2959:3226]

∅:D[10.2631] → [8.2959:3226]

B:BD[8.2959] → [8.2959:3226]

        // God gifts override amulets of resist mutation.
        if ((wearing_amulet(AMU_RESIST_MUTATION) ? !one_chance_in(10)
                                                 : one_chance_in(3))
            && !god_gift)
        {
            if (failMsg)
                mpr("You feel odd for a moment.", MSGCH_MUTATION);

[5.1300797]

[8.3226]

        mpr("Your body decomposes!", MSGCH_MUTATION);

Replacement in crawl-ref/source/mutation.cc at line 1721 [5.1263003]
B:BD[8.3227] → [4.2586:2612]
∅:D[4.2612] → [8.3255:3265]
B:BD[8.3255] → [8.3255:3265]
```
            return false;
        }
```
[8.3227]
[8.3265]
```
        if (coinflip())
            lose_stat(STAT_RANDOM, 1, false, "mutating");
```

Replacement in crawl-ref/source/mutation.cc at line 1725 [5.1263003]

B:BD[5.1300903] → [11.184:244]

∅:D[11.244] → [5.1300947:1300976]

B:BD[5.1300947] → [5.1300947:1300976]

B:BD[5.1300976] → [4.2613:2676]

∅:D[4.2676] → [5.1301021:1301161]

∅:D[12.9244] → [5.1301021:1301161]

B:BD[5.1301021] → [5.1301021:1301161]

B:BD[5.1301161] → [13.647:682]

B:BD[13.682] → [4.2677:2702]

            mpr( "Your body decomposes!", MSGCH_MUTATION );
            if (coinflip())
                lose_stat( STAT_RANDOM, 1, false, "mutating");
            else
            {
                ouch( 3, 0, KILLED_BY_ROTTING );
                rot_hp( roll_dice( 1, 3 ) );
            }
            xom_is_stimulated(64);
            return true;

[5.1300903]

[5.1301188]

            ouch(3, 0, KILLED_BY_ROTTING);
            rot_hp(roll_dice(1, 3));

Deletion in crawl-ref/source/mutation.cc at line 1728 [5.1263003]
B:BD[5.1301492] → [5.1301492:1301498]
```
    }
```
Replacement in crawl-ref/source/mutation.cc at line 1729 [5.1263003]
B:BD[5.1301499] → [14.10159:10184]
∅:D[14.10184] → [5.1301650:1301656]
B:BD[5.1301650] → [5.1301650:1301656]
B:BD[5.1301656] → [3.2617:2675]
∅:D[3.2675] → [9.2683:2754]
B:BD[9.2683] → [9.2683:2754]
∅:D[9.2754] → [8.3492:3522]
B:BD[8.3492] → [8.3492:3522]
B:BD[8.3522] → [9.2755:2828]
∅:D[9.2828] → [7.20675:20841]
∅:D[8.3522] → [7.20675:20841]
B:BD[15.2731] → [7.20675:20841]
∅:D[7.20841] → [14.10455:10557]
B:BD[14.10455] → [14.10455:10557]
∅:D[11.436] → [5.1301724:1301725]
∅:D[14.10557] → [5.1301724:1301725]
B:BD[5.1301724] → [5.1301724:1301725]
B:BD[5.1301725] → [4.2703:2729]
∅:D[4.2729] → [14.10586:10596]
B:BD[14.10586] → [14.10586:10596]
```
    if (!force_mutation)
    {
        // God gifts override amulets of resist mutation.
        if ((wearing_amulet(AMU_RESIST_MUTATION) && !one_chance_in(10)
                && !god_gift)
            || you.religion == GOD_ZIN && you.piety > random2(MAX_PIETY)
            || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
            || player_mutation_level(MUT_MUTATION_RESISTANCE)
               && !one_chance_in(3))
        {
            if (failMsg)
                mpr("You feel odd for a moment.", MSGCH_MUTATION);
            return false;
        }
```
[5.1301499]
[5.1301749]
```
        xom_is_stimulated(64);
        return true;
```

Simplify mutation handling again, and add a message for when Zin's

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mutation.cc at line 1659 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1717 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1719 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1721 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1725 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 1728 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1729 [5.1263003]