fiddlerwoaroof/crawl - Change 5QRXZHCR7QAYOILGUCQPVNLM4NQM5E5PPVNRGGMARWAIRJYKUJEQC

Let god-given mutation effects override the mutation resistance mutation

again.

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

Created by dolorous on July 11, 2009

5QRXZHCR7QAYOILGUCQPVNLM4NQM5E5PPVNRGGMARWAIRJYKUJEQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 1462 [6.3]

B:BD[5.3528] → [5.3528:3623]

    if (you.can_safely_mutate()
        && player_mutation_level(MUT_MUTATION_RESISTANCE) < 3)

[5.3528]

[5.3623]

    if (you.can_safely_mutate())

Replacement in crawl-ref/source/xom.cc at line 2861 [6.3]

B:BD[7.2989] → [7.2989:3035]

            delete_mutation(bad, true, true);

[7.2989]

[7.3035]

            delete_mutation(bad, true, true, true);

Replacement in crawl-ref/source/xom.cc at line 2874 [6.3]

B:BD[7.3363] → [7.3363:3419]

        delete_mutation(MUT_FLEXIBLE_WEAK, true, true);

[7.3363]

[7.3419]

        delete_mutation(MUT_FLEXIBLE_WEAK, true, true, true);

Replacement in crawl-ref/source/religion.cc at line 4213 [10.804403]
B:BD[8.2821] → [9.2606:2685]
```
    if (!how_mutated() || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3)
```
[8.2821]
[3.2606]
```
    if (!how_mutated())
```

Replacement in crawl-ref/source/religion.cc at line 4224 [10.804403]

B:BD[8.2956] → [9.2745:2825]

        if (i <= random2(10) && delete_mutation(RANDOM_GOOD_MUTATION, failMsg))

[8.2956]

[8.3026]

        if (i <= random2(10)
            && delete_mutation(RANDOM_GOOD_MUTATION, failMsg, false, true))
        {

Insertion in crawl-ref/source/religion.cc at line 4228 [10.804403]
[8.3054]
[11.2817]
```
        }
```

Replacement in crawl-ref/source/religion.cc at line 4247 [10.804403]

B:BD[12.2712] → [13.2949:3017]

B:BD[13.3017] → [2.2606:2629]

∅:D[2.2629] → [13.3040:3142]

B:BD[13.3040] → [13.3040:3142]

    // If not mutated or can't unmutate, do something else instead.
    if (punishment > 7
        && (!how_mutated()
            || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3))
    {

[12.2712]

[2.2630]

    // If not mutated, do something else instead.
    if (punishment > 7 && !how_mutated())

Deletion in crawl-ref/source/religion.cc at line 4250 [10.804403]
∅:D[2.2663] → [13.3143:3149]
B:BD[14.5367] → [13.3143:3149]
```
    }
```

Replacement in crawl-ref/source/mutation.h at line 47 [10.1260415]

B:BD[15.2629] → [16.6637:6712]

                     bool force_mutation = false, bool non_fatal = false);

[15.2629]

[10.1261575]

                     bool force_mutation = false, bool god_gift = false,
                     bool non_fatal = false);

Replacement in crawl-ref/source/mutation.cc at line 2051 [10.1263003]

B:BD[17.2629] → [18.2600:2805]

∅:D[18.2805] → [19.7380:7428]

B:BD[17.2701] → [19.7380:7428]

B:BD[19.7428] → [18.2806:2878]

∅:D[18.2878] → [20.2828:2895]

∅:D[19.7479] → [20.2828:2895]

B:BD[20.2828] → [20.2828:2895]

∅:D[20.2895] → [21.2816:2878]

∅:D[22.2988] → [21.2816:2878]

B:BD[21.2816] → [21.2816:2878]

B:BD[21.2878] → [19.7480:7517]

        // than the mutation resistance mutation and divine protection,
        // and stat gain potions override all sources of mutation
        // resistance other than the mutation resistance mutation.
        if (wearing_amulet(AMU_RESIST_MUTATION)
                && !one_chance_in(10) && !god_gift && !stat_gain_potion
            || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
            || player_mutation_level(MUT_MUTATION_RESISTANCE)
               && !one_chance_in(3))

[17.2629]

[21.2916]

        // than divine protection, and stat gain potions override all
        // sources of mutation resistance other than the mutation
        // resistance mutation.
        if (!god_gift)

Replacement in crawl-ref/source/mutation.cc at line 2056 [10.1263003]

B:BD[21.2926] → [23.2558:2650]

B:BD[23.2650] → [24.17948:17976]

            if (failMsg)
                mpr("You feel odd for a moment.", MSGCH_MUTATION);
            return (false);

[21.2926]

[21.3015]

            if (wearing_amulet(AMU_RESIST_MUTATION)
                    && !one_chance_in(10) && !stat_gain_potion
                || 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);
            }

Replacement in crawl-ref/source/mutation.cc at line 2320 [10.1263003]

B:BD[15.2696] → [16.10634:10692]

                     bool force_mutation, bool non_fatal)

[15.2696]

[10.1314615]

                     bool force_mutation, bool god_gift,
                     bool non_fatal)

Replacement in crawl-ref/source/mutation.cc at line 2329 [10.1263003]

B:BD[10.1314789] → [20.2978:3141]

        if (player_mutation_level(MUT_MUTATION_RESISTANCE) > 1
            && (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
                || coinflip()))

[10.1314789]

[25.3110]

        if (!god_gift)

Replacement in crawl-ref/source/mutation.cc at line 2331 [10.1263003]

B:BD[25.3120] → [15.2697:2796]

B:BD[15.2796] → [24.20109:20137]

            if (failMsg)
                mpr("You feel rather odd for a moment.", MSGCH_MUTATION);
            return (false);

[25.3120]

[25.3216]

            if (player_mutation_level(MUT_MUTATION_RESISTANCE) > 1
                && (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
                    || coinflip()))
            {
                if (failMsg)
                    mpr("You feel rather odd for a moment.", MSGCH_MUTATION);
                return (false);
            }

Replacement in crawl-ref/source/debug.cc at line 3972 [10.4016436]

∅:D[4.15323] → [15.2930:2987]

B:BD[10.4061937] → [15.2930:2987]

                if (delete_mutation(mutat, true, force))

[4.15323]

[10.4061986]

                if (delete_mutation(mutat, true, force, god_gift))