fiddlerwoaroof/crawl - Change TH2RUX3XQ5I43J4ASC4C3KHFCBUOYQ4EUBMXPQV4JCJGPTZZAYAAC

After some thought, revert previous change. If the mutation resistance

mutation is hard to remove, it should be hard to get, god gift or not.

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

Created by dolorous on April 28, 2008

TH2RUX3XQ5I43J4ASC4C3KHFCBUOYQ4EUBMXPQV4JCJGPTZZAYAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2958 [4.804403]

B:BD[3.2745] → [2.2528:2599]

                && delete_mutation(RANDOM_GOOD_MUTATION, false, true))

[3.2745]

[3.2809]

                && delete_mutation(RANDOM_GOOD_MUTATION))

Replacement in crawl-ref/source/mutation.h at line 59 [4.1260415]

B:BD[5.2667] → [2.2629:2703]

                     bool force_mutation = false, bool god_gift = false);

[5.2667]

[4.1261575]

                     bool force_mutation = false);

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

B:BD[6.2590] → [2.2705:2988]

        // God gifts override amulets of resist mutation and less than 3
        // levels of the mutation resistance mutation.
        if (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
            || ((wearing_amulet(AMU_RESIST_MUTATION)
                && !one_chance_in(10)

[6.2590]

[6.2816]

        // 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

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

B:BD[6.2878] → [2.2989:3042]

                && !one_chance_in(3)) && !god_gift))

[6.2878]

[6.2916]

                && !one_chance_in(3))

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

B:BD[5.2771] → [2.3043:3100]

                     bool force_mutation, bool god_gift)

[5.2771]

[4.1314615]

                     bool force_mutation)

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

B:BD[4.1314789] → [2.3101:3376]

        // God gifts override less than 3 levels of the mutation
        // resistance mutation.
        if (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
            || ((player_mutation_level(MUT_MUTATION_RESISTANCE) > 1
                && coinflip()) && !god_gift))

[4.1314789]

[7.3110]

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

Replacement in crawl-ref/source/debug.cc at line 2457 [4.4016436]

B:BD[4.4061937] → [2.3510:3571]

                if (delete_mutation(mutat, force, god_gift))

[4.4061937]

[4.4061986]

                if (delete_mutation(mutat, force))