fiddlerwoaroof/crawl - Change 5CPP63H7WJ3GLSHJM4Z2YSU2NISLVESEJ3OYMO4MFZEXVOCV4NIAC

Simplify Xom's mutating the player.

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

Created by dolorous on June 24, 2008

5CPP63H7WJ3GLSHJM4Z2YSU2NISLVESEJ3OYMO4MFZEXVOCV4NIAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 629 [6.3]
[5.109]
[6.16618]

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

B:BD[6.16703] → [3.4:109]

        if (!you.can_safely_mutate()
            || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3)

[6.16703]

[3.109]

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

Replacement in crawl-ref/source/xom.cc at line 637 [6.3]
∅:D[7.38] → [8.2243:2271]
∅:D[9.96] → [8.2243:2271]
∅:D[3.119] → [8.2243:2271]
∅:D[10.119] → [8.2243:2271]
B:BD[8.2243] → [8.2243:2271]
B:BD[8.2271] → [3.120:130]
```
            goto try_again;
        }
```
[3.119]
[8.2271]
```
            god_speaks(GOD_XOM, _get_xom_speech("good mutations"));
```
Replacement in crawl-ref/source/xom.cc at line 639 [6.3]
B:BD[8.2272] → [11.1456:1520]
∅:D[11.1520] → [6.17069:17133]
∅:D[8.2590] → [6.17069:17133]
∅:D[12.3391] → [6.17069:17133]
B:BD[6.17069] → [6.17069:17133]
```
        god_speaks(GOD_XOM, _get_xom_speech("good mutations"));
        mpr("Your body is suffused with distortional energy.");
```
[8.2272]
[13.176]
```
            mpr("Your body is suffused with distortional energy.");
```

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

∅:D[13.177] → [6.17150:17236]

B:BD[6.17150] → [6.17150:17236]

        set_hp(1 + random2(you.hp), false);
        deflate_hp(you.hp_max / 2, true);

[13.177]

[13.178]

            set_hp(1 + random2(you.hp), false);
            deflate_hp(you.hp_max / 2, true);
            bool failMsg = true;

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

∅:D[13.179] → [6.17253:17282]

B:BD[6.17253] → [6.17253:17282]

B:BD[6.17282] → [2.4:50]

∅:D[2.50] → [6.17351:17361]

B:BD[6.17351] → [6.17351:17361]

B:BD[6.17361] → [4.4:72]

∅:D[14.59] → [6.17405:17484]

∅:D[15.65] → [6.17405:17484]

∅:D[4.72] → [6.17405:17484]

∅:D[16.79] → [6.17405:17484]

B:BD[6.17405] → [6.17405:17484]

        bool failMsg = true;
        for (int i = random2(4); i >= 0; --i)
        {
            if (mutate(RANDOM_GOOD_MUTATION, failMsg, false, true))
                done = true;
            else
                failMsg = false;

[13.179]

[6.17501]

            for (int i = random2(4); i >= 0; --i)
            {
                if (mutate(RANDOM_GOOD_MUTATION, failMsg, false, true))
                    done = true;
                else
                    failMsg = false;
            }

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

B:BD[6.22292] → [3.131:244]

            if (!you.can_safely_mutate()
                || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3)

[6.22292]

[3.244]

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

Replacement in crawl-ref/source/xom.cc at line 775 [6.3]
∅:D[7.77] → [8.4353:4385]
∅:D[9.139] → [8.4353:4385]
∅:D[3.258] → [8.4353:4385]
∅:D[10.278] → [8.4353:4385]
B:BD[8.4353] → [8.4353:4385]
B:BD[8.4385] → [3.259:273]
```
                goto try_again;
            }
```
[3.258]
[10.293]
```
                god_speaks(GOD_XOM, _get_xom_speech("random mutations"));
```

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

∅:D[10.294] → [11.1965:2035]

B:BD[8.4385] → [11.1965:2035]

∅:D[11.2035] → [6.22679:22747]

∅:D[8.4721] → [6.22679:22747]

B:BD[6.22679] → [6.22679:22747]

            god_speaks(GOD_XOM, _get_xom_speech("random mutations"));
            mpr("Your body is suffused with distortional energy.");

[10.294]

[13.393]

                mpr("Your body is suffused with distortional energy.");

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

∅:D[13.394] → [6.22764:22858]

B:BD[6.22764] → [6.22764:22858]

            set_hp(1 + random2(you.hp), false);
            deflate_hp(you.hp_max / 2, true);

[13.394]

[13.395]

                set_hp(1 + random2(you.hp), false);
                deflate_hp(you.hp_max / 2, true);

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

∅:D[13.396] → [6.22875:22908]

B:BD[6.22875] → [6.22875:22908]

B:BD[6.22908] → [2.51:101]

∅:D[2.101] → [6.22959:22973]

B:BD[6.22959] → [6.22959:22973]

B:BD[6.22973] → [4.73:144]

∅:D[14.124] → [6.23021:23112]

∅:D[4.144] → [6.23021:23112]

∅:D[16.158] → [6.23021:23112]

B:BD[6.23021] → [6.23021:23112]

            bool failMsg = true;
            for (int i = random2(4); i >= 0; --i)
            {
                if (mutate(RANDOM_XOM_MUTATION, failMsg, false, true))
                    done = true;
                else
                    failMsg = false;

[13.396]

[6.23112]

                bool failMsg = true;
                for (int i = random2(4); i >= 0; --i)
                {
                    if (mutate(RANDOM_XOM_MUTATION, failMsg, false, true))
                        done = true;
                    else
                        failMsg = false;
                }