fiddlerwoaroof/crawl - Change MKJ2ORKSFPOPYEB5C36WZTR2QFHQYQ23PCLSC6SA44LJZ2AFBZFQC

Have Xom check directly for negative energy and torment resistance when

trying to drain or torment the player, instead of just checking whether the player is undead. This allows vampires in the vulnerable hunger states to be affected.

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

Created by dolorous on April 27, 2008

MKJ2ORKSFPOPYEB5C36WZTR2QFHQYQ23PCLSC6SA44LJZ2AFBZFQC

Dependencies

In channels

main

Change contents

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

B:BD[3.24021] → [4.5212:5243]

            if (you.is_undead)

[3.24021]

[4.5243]

            bool draining = one_chance_in(4);
            if ((draining && player_prot_life() >= 3)
                || (!draining && player_res_torment()))
            {

Insertion in crawl-ref/source/xom.cc at line 832 [3.3]
[4.5275]
[2.132]
```
            }
```
Replacement in crawl-ref/source/xom.cc at line 836 [3.3]
∅:D[5.398] → [3.24455:24489]
B:BD[3.24455] → [3.24455:24489]
```
            if (one_chance_in(4))
```
[5.398]
[3.24489]
```
            if (draining)
```

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

B:BD[3.24788] → [3.24788:24837]

                set_hp(1 + (you.hp / 2), false);

[3.24788]

[3.24837]

                set_hp((you.hp / 2) + 1, false);