fiddlerwoaroof/crawl - Change CQMX53TEZCRYKPNWUSNMMRRYBTRDF4Z4LXZWD7CSCZH6GDVDEK7QC

Expand mutate() to account for mutations as god gifts, and make Xom use

them, so that he respects the full mutation resistance mutation, as well as the limitations on how much players can be covered in scales, etc.

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

Created by dolorous on April 26, 2008

CQMX53TEZCRYKPNWUSNMMRRYBTRDF4Z4LXZWD7CSCZH6GDVDEK7QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 641 [5.3]

B:BD[5.17361] → [6.4:65]

            if (mutate(RANDOM_GOOD_MUTATION, failMsg, true))

[5.17361]

[5.17405]

            if (mutate(RANDOM_GOOD_MUTATION, failMsg, false, false, true))

Replacement in crawl-ref/source/xom.cc at line 773 [5.3]

B:BD[5.22973] → [7.60:124]

                if (mutate(RANDOM_XOM_MUTATION, failMsg, true))

[5.22973]

[5.23021]

                if (mutate(RANDOM_XOM_MUTATION, failMsg, false, false, true))

Replacement in crawl-ref/source/mutation.h at line 40 [8.1260415]

∅:D[7.771] → [5.36354:36421]

B:BD[5.36354] → [5.36354:36421]

            bool force_mutation = false, bool demonspawn = false);

[7.771]

[8.1261056]

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

Replacement in crawl-ref/source/mutation.cc at line 1652 [8.1263003]

B:BD[4.2870] → [4.2870:2920]

            bool force_mutation, bool demonspawn)

[4.2870]

[5.37740]

            bool force_mutation, bool god_gift,
            bool demonspawn)

Replacement in crawl-ref/source/mutation.cc at line 1697 [8.1263003]

B:BD[8.1300797] → [3.4146:4283]

        if (wearing_amulet(AMU_RESIST_MUTATION) ? one_chance_in(10)
                                                : !one_chance_in(3))

[8.1300797]

[8.1300893]

        // Temporary resistance can be overridden by a god gift.
        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);
            return (false);
        }
        else

Deletion in crawl-ref/source/mutation.cc at line 1722 [8.1263003]
B:BD[8.1301298] → [8.1301298:1301299]
B:BD[8.1301399] → [8.1301399:1301420]
B:BD[8.1301420] → [9.309:372]
∅:D[9.372] → [8.1301467:1301492]
B:BD[8.1301467] → [8.1301467:1301492]
```
        if (failMsg)
            mpr("You feel odd for a moment.", MSGCH_MUTATION);
        return (false);
```

Replacement in crawl-ref/source/mutation.cc at line 1726 [8.1263003]

B:BD[8.1301656] → [10.10185:10255]

B:BD[10.10255] → [11.2658:2731]

        if (wearing_amulet(AMU_RESIST_MUTATION) && !one_chance_in(10)
            || you.religion == GOD_ZIN && you.piety > random2(MAX_PIETY)

[8.1301656]

[12.20675]

        // Temporary resistance can be overridden by a god gift.
        if (((wearing_amulet(AMU_RESIST_MUTATION) && !one_chance_in(10))
            || (you.religion == GOD_ZIN && you.piety > random2(MAX_PIETY))
                && !god_gift)

Deletion in crawl-ref/source/mutation.cc at line 1788 [8.1263003]
B:BD[8.1302885] → [8.1302885:1302926]
```
    // These can be forced by demonspawn
```
Replacement in crawl-ref/source/mutation.cc at line 1814 [8.1263003]
B:BD[8.1304507] → [8.1304507:1304551]
```
    // This one can be forced by demonspawn
```
[8.1304507]
[8.1304551]
```
    // This one can be forced by demonspawn or a god gift
```

Replacement in crawl-ref/source/mutation.cc at line 1816 [8.1263003]

B:BD[8.1304585] → [8.1304585:1304654]

        && you.mutation[MUT_SLOW_METABOLISM] > 0 && !force_mutation)

[8.1304585]

[8.1304654]

        && you.mutation[MUT_SLOW_METABOLISM] > 0 && !god_gift
        && !force_mutation)

Replacement in crawl-ref/source/mutation.cc at line 1825 [8.1263003]
B:BD[8.1304900] → [8.1304900:1304944]
```
    // This one can be forced by demonspawn
```
[8.1304900]
[8.1304944]
```
    // This one can be forced by demonspawn or a god gift
```

Replacement in crawl-ref/source/mutation.cc at line 1827 [8.1263003]

B:BD[8.1304978] → [8.1304978:1305045]

        && you.mutation[MUT_BLURRY_VISION] > 0 && !force_mutation)

[8.1304978]

[8.1305045]

        && you.mutation[MUT_BLURRY_VISION] > 0 && !god_gift
        && !force_mutation)

Replacement in crawl-ref/source/mutation.cc at line 1948 [8.1263003]

B:BD[8.1307869] → [8.1307869:1308000]

            // Should only get here from demonspawn, where our innate
            // ability will clear away the counter-mutation.

[8.1307869]

[8.1308000]

            // Should only get here from demonspawn or a god gift, where
            // our innate ability will clear away the counter-mutation.

Replacement in crawl-ref/source/mutation.cc at line 1959 [8.1263003]

B:BD[8.1308259] → [2.2535:2605]

∅:D[2.2605] → [8.1308328:1308389]

B:BD[8.1308328] → [8.1308328:1308389]

            // Should only get here from demonspawn, where our innate
            // ability will clear away the counter-mutation.

[8.1308259]

[8.1308389]

            // Should only get here from demonspawn or a god gift, where
            // our innate ability will clear away the counter-mutation.

Replacement in crawl-ref/source/mutation.cc at line 2758 [8.1263003]
∅:D[13.333] → [5.39834:39880]
∅:D[12.22782] → [5.39834:39880]
B:BD[8.1331354] → [5.39834:39880]
```
    if (mutate(which_mut, false, true, true))
```
[12.22782]
[8.1331388]
```
    if (mutate(which_mut, false, true, false, true))
```

Replacement in crawl-ref/source/mutation.cc at line 2761 [8.1263003]

B:BD[8.1331407] → [5.39881:39944]

    if (how_much >= 2 && mutate(which_mut, false, true, true))

[8.1331407]

[8.1331458]

    if (how_much >= 2 && mutate(which_mut, false, true, false, true))

Replacement in crawl-ref/source/mutation.cc at line 2764 [8.1263003]

B:BD[8.1331477] → [5.39945:40008]

    if (how_much >= 3 && mutate(which_mut, false, true, true))

[8.1331477]

[8.1331528]

    if (how_much >= 3 && mutate(which_mut, false, true, false, true))