fiddlerwoaroof/crawl - Change DP6XLMKLDC42SWISM7WKLJFTJTRZ3BKTRS7DWUQWLLP3DR4UUGZAC

Simplify Xom's choosing of a random potion effect more.

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

Created by dolorous on June 24, 2008

DP6XLMKLDC42SWISM7WKLJFTJTRZ3BKTRS7DWUQWLLP3DR4UUGZAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 438 [3.3]

B:BD[3.12035] → [2.4:29]

        potion_type pot;

[3.12035]

[4.4]

        potion_type pot =
            static_cast<potion_type>(
                random_choose(POT_HEALING, POT_HEAL_WOUNDS, POT_SPEED,
                              POT_MIGHT, POT_INVISIBILITY, POT_BERSERK_RAGE,
                              POT_EXPERIENCE, -1));
        // Downplay this one a bit.
        if (pot == POT_EXPERIENCE && !one_chance_in(6))
            pot = POT_BERSERK_RAGE;

Replacement in crawl-ref/source/xom.cc at line 448 [3.3]

B:BD[4.5] → [2.30:41]

do

[4.5]

[5.5]

        if (pot != POT_BERSERK_RAGE || you.can_go_berserk(false))

Replacement in crawl-ref/source/xom.cc at line 450 [3.3]

B:BD[5.15] → [2.42:229]

            pot = (potion_type)random_choose(
                POT_HEALING, POT_HEAL_WOUNDS, POT_SPEED, POT_MIGHT,
                POT_INVISIBILITY, POT_BERSERK_RAGE, POT_EXPERIENCE, -1);

[5.15]

[4.8]

            god_speaks(GOD_XOM, _get_xom_speech("potion effect"));

Replacement in crawl-ref/source/xom.cc at line 452 [3.3]

B:BD[4.9] → [2.230:489]

∅:D[4.9] → [3.13129:13183]

∅:D[5.105] → [3.13129:13183]

∅:D[2.489] → [3.13129:13183]

∅:D[6.856] → [3.13129:13183]

B:BD[3.13129] → [3.13129:13183]

B:BD[5.116] → [7.172:173]

B:BD[7.173] → [8.863:926]

            // Downplay this one a bit.
            if (pot == POT_EXPERIENCE && !one_chance_in(6))
                pot = POT_BERSERK_RAGE;
        }
        while (pot == POT_BERSERK_RAGE && !you.can_go_berserk(false));
        if (pot == POT_BERSERK_RAGE)
            you.berserk_penalty = NO_BERSERK_PENALTY;
        god_speaks(GOD_XOM, _get_xom_speech("potion effect"));

[4.9]

[5.401]

            if (pot == POT_BERSERK_RAGE)
                you.berserk_penalty = NO_BERSERK_PENALTY;

Replacement in crawl-ref/source/xom.cc at line 455 [3.3]
B:BD[5.402] → [2.490:523]
```
        potion_effect(pot, 150);
```
[5.402]
[4.10]
```
            potion_effect(pot, 150);
```
Replacement in crawl-ref/source/xom.cc at line 457 [3.3]
∅:D[4.11] → [3.13279:13300]
∅:D[6.891] → [3.13279:13300]
B:BD[3.13279] → [3.13279:13300]
```
        done = true;
```
[4.11]
[3.13300]
```
            done = true;
        }
```