fiddlerwoaroof/crawl - Change U5QVBQESPTUIYTYVA2VU254NO5MTJA5SYMXMQ4SG2LPWMDNGCDPAC

Simplify Xom's choosing of a random potion effect.

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

Created by dolorous on June 24, 2008

U5QVBQESPTUIYTYVA2VU254NO5MTJA5SYMXMQ4SG2LPWMDNGCDPAC

Dependencies

In channels

main

Change contents

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

B:BD[3.501] → [3.501:689]

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

[4.12035]

[5.4]

        potion_type pot;

Replacement in crawl-ref/source/xom.cc at line 440 [4.3]
B:BD[5.5] → [2.1135:1171]
∅:D[2.1171] → [3.724:818]
B:BD[3.724] → [3.724:818]
B:BD[3.818] → [5.6:7]
∅:D[5.7] → [3.818:856]
B:BD[3.818] → [3.818:856]
```
        // Downplay this one a bit.
        if (type == POT_EXPERIENCE && !one_chance_in(6))
            type = POT_BERSERK_RAGE;
        if (type == POT_BERSERK_RAGE)
```
[5.5]
[6.5]
```
        do
```

Replacement in crawl-ref/source/xom.cc at line 442 [4.3]

B:BD[6.15] → [2.1172:1231]

∅:D[2.1231] → [6.73:105]

B:BD[6.73] → [6.73:105]

            if (!you.can_go_berserk(false)) // No message.
                goto try_again;

[6.15]

[5.8]

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

Insertion in crawl-ref/source/xom.cc at line 446 [4.3]

[5.9]

[4.13129]

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

Deletion in crawl-ref/source/xom.cc at line 454 [4.3]
B:BD[4.13183] → [6.106:116]
```
        }
```
Replacement in crawl-ref/source/xom.cc at line 457 [4.3]
∅:D[6.402] → [3.857:891]
B:BD[4.13183] → [3.857:891]
```
        potion_effect(type, 150);
```
[6.402]
[5.10]
```
        potion_effect(pot, 150);
```
Deletion in crawl-ref/source/xom.cc at line 722 [4.3]
B:BD[4.19528] → [3.2969:2980]
```
try_again:
```

Simplify Xom's choosing of a random potion effect.

Dependencies

In channels

Change contents

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

Replacement in crawl-ref/source/xom.cc at line 440 [4.3]

Replacement in crawl-ref/source/xom.cc at line 442 [4.3]

Insertion in crawl-ref/source/xom.cc at line 446 [4.3]

Deletion in crawl-ref/source/xom.cc at line 454 [4.3]

Replacement in crawl-ref/source/xom.cc at line 457 [4.3]

Deletion in crawl-ref/source/xom.cc at line 722 [4.3]