fiddlerwoaroof/crawl - Change NTLY3XBVMGR2PTGCDOBYLZTZKYGDMAY6VNC6TVK2EBY2VMS5SUMAC

Fix [2253304]: Allow potions of gain [stat] to work in spite of mutation

resistance from either the amulet or Zin, but let them fail with the mutation resistance mutation.

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

Created by dolorous on November 25, 2008

NTLY3XBVMGR2PTGCDOBYLZTZKYGDMAY6VNC6TVK2EBY2VMS5SUMAC

Dependencies

In channels

main

Change contents

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

B:BD[3.2776] → [3.2776:2814]

            bool demonspawn = false);

[3.2776]

[4.1261056]

            bool stat_gain_potion = false, bool demonspawn = false);

Replacement in crawl-ref/source/mutation.cc at line 1694 [4.1263003]
B:BD[3.2864] → [3.2864:2893]
```
            bool demonspawn)
```
[3.2864]
[5.37740]
```
            bool stat_gain_potion, bool demonspawn)
```

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

B:BD[6.2629] → [6.2629:2701]

        // than the mutation resistance mutation and divine protection.

[6.2629]

[7.7380]

        // than the mutation resistance mutation and divine protection,
        // and stat gain potions override all sources of mutation
        // resistance other than the mutation resistance mutation.

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

B:BD[7.7428] → [7.7428:7479]

                && !one_chance_in(10) && !god_gift

[7.7428]

[8.2828]

                && !one_chance_in(10) && !god_gift && !stat_gain_potion

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

B:BD[9.3055] → [2.6491:6567]

        if (you.religion == GOD_ZIN && x_chance_in_y(you.piety, MAX_PIETY))

[9.3055]

[9.3126]

        if (you.religion == GOD_ZIN && x_chance_in_y(you.piety, MAX_PIETY)
            && !stat_gain_potion)

Replacement in crawl-ref/source/mutation.cc at line 2807 [4.1263003]
B:BD[10.22782] → [3.4113:4166]
```
    if (mutate(which_mut, false, true, false, true))
```
[10.22782]
[4.1331388]
```
    if (mutate(which_mut, false, true, false, false, true))
```

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

B:BD[4.1331407] → [3.4167:4237]

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

[4.1331407]

[4.1331458]

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

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

B:BD[4.1331477] → [3.4238:4308]

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

[4.1331477]

[4.1331528]

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

Replacement in crawl-ref/source/it_use2.cc at line 150 [4.2904329]
B:BD[4.2907137] → [11.40357:40389]
```
        if (mutate(MUT_STRONG))
```
[4.2907137]
[11.40389]
```
        if (mutate(MUT_STRONG, true, false, false, true))
```
Replacement in crawl-ref/source/it_use2.cc at line 155 [4.2904329]
B:BD[4.2907210] → [11.40442:40473]
```
        if (mutate(MUT_AGILE))
```
[4.2907210]
[11.40473]
```
        if (mutate(MUT_AGILE, true, false, false, true))
```
Replacement in crawl-ref/source/it_use2.cc at line 160 [4.2904329]
B:BD[4.2907285] → [11.40526:40558]
```
        if (mutate(MUT_CLEVER))
```
[4.2907285]
[11.40558]
```
        if (mutate(MUT_CLEVER, true, false, false, true))
```

Fix [2253304]: Allow potions of gain [stat] to work in spite of mutation

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/it_use2.cc at line 150 [4.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 155 [4.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 160 [4.2904329]