fiddlerwoaroof/crawl - Change RMPMIONAOIYDZ5GWRUT65OVWAIQX7NWQ5QAPU6FSIODAGBAI5BIAC

Properly handle Xom's failing to drain or torment the player.

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

Created by dolorous on June 24, 2008

RMPMIONAOIYDZ5GWRUT65OVWAIQX7NWQ5QAPU6FSIODAGBAI5BIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 822 [4.3]
B:BD[4.24021] → [2.4:69]
∅:D[5.69] → [6.5243:5275]
∅:D[2.69] → [6.5243:5275]
∅:D[7.69] → [6.5243:5275]
∅:D[8.175] → [6.5243:5275]
B:BD[6.5243] → [6.5243:5275]
∅:D[8.190] → [9.132:133]
B:BD[6.5275] → [9.132:133]
∅:D[9.133] → [10.2121:2194]
B:BD[6.5275] → [10.2121:2194]
```
            if (player_prot_life() == 3 && player_res_torment())
                goto try_again;
            god_speaks(GOD_XOM, _get_xom_speech("draining or torment"));
```
[4.24021]
[11.397]
```
            const char *speech = _get_xom_speech("draining or torment");
```

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

B:BD[4.24503] → [4.24503:24572]

                drain_exp();
                if (random2(sever) > 3)

[4.24503]

[4.24572]

                if (player_prot_life() < 3)
                {
                    god_speaks(GOD_XOM, speech);

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

B:BD[4.24605] → [4.24605:24678]

                if (random2(sever) > 3)
                    drain_exp();

[4.24605]

[4.24678]

                    if (random2(sever) > 3)
                        drain_exp();
                    if (random2(sever) > 3)
                        drain_exp();
                    done = true;
                }

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

B:BD[4.24709] → [3.4:52]

                torment_player(0, TORMENT_XOM);

[4.24709]

[11.399]

            {
                if (!player_res_torment())
                {
                    god_speaks(GOD_XOM, speech);
                    torment_player(0, TORMENT_XOM);

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

∅:D[11.400] → [4.24868:24893]

B:BD[4.24868] → [4.24868:24893]

            done = true;

[11.400]

[4.24893]

                    done = true;
                }
            }