fiddlerwoaroof/crawl - Change ZB5MLJOVFY2ZULUWA237VLTIJONQOW2QMOEB4O3WRQRJK4QWYOZQC

Fix inconsistencies between Vampiric Draining and Yred's Drain Life: the

former no longer gives 1 HP minimum, but no longer displays the "life coursing into your body" message if you don't gain any HP; and the latter no longer works on summoned monsters.

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

Created by dolorous on March 13, 2009

ZB5MLJOVFY2ZULUWA237VLTIJONQOW2QMOEB4O3WRQRJK4QWYOZQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells2.cc at line 683 [5.569242]
∅:D[4.2425] → [5.593358:593414]
B:BD[5.593358] → [5.593358:593414]
```
        if (monster->type == -1)
            continue;
```

Replacement in crawl-ref/source/spells2.cc at line 684 [5.569242]

B:BD[5.593415] → [6.151875:151925]

∅:D[6.151925] → [5.593473:593496]

B:BD[5.593473] → [5.593473:593496]

B:BD[5.593496] → [7.169:216]

        if (mons_holiness(monster) != MH_NATURAL)
            continue;
        if (mons_res_negative_energy(monster))

[5.593415]

[5.593545]

        if (!monster->alive()
            || mons_holiness(monster) != MH_NATURAL
            || mons_res_negative_energy(monster)
            || mons_is_summoned(monster))
        {

Insertion in crawl-ref/source/spells2.cc at line 690 [5.569242]
[5.593567]
[5.593567]
```
        }
```

Replacement in crawl-ref/source/spells2.cc at line 745 [5.569242]

∅:D[2.406] → [8.487:524]

B:BD[5.595163] → [8.487:524]

        if (mons_is_unholy(monster))

[2.406]

[8.524]

        if (!monster->alive()
            || (mons_holiness(monster) != MH_NATURAL
                && !mons_is_unholy(monster))
            || mons_res_negative_energy(monster)
            || mons_is_summoned(monster))

Replacement in crawl-ref/source/spells2.cc at line 751 [5.569242]

B:BD[8.534] → [8.534:647]

            mpr("Aaaarggghhhhh!");
            dec_hp(random2avg(39, 2) + 10, false, "vampiric drain backlash");

[8.534]

[8.647]

            canned_msg(MSG_NOTHING_HAPPENS);

Replacement in crawl-ref/source/spells2.cc at line 755 [5.569242]

B:BD[5.595281] → [3.546:622]

        if (mons_res_negative_energy(monster) || mons_is_summoned(monster))

[5.595281]

[8.733]

        if (mons_is_unholy(monster))

Replacement in crawl-ref/source/spells2.cc at line 757 [5.569242]

B:BD[8.743] → [8.743:788]

            canned_msg(MSG_NOTHING_HAPPENS);

[8.743]

[8.788]

            mpr("Aaaarggghhhhh!");
            dec_hp(random2avg(39, 2) + 10, false, "vampiric drain backlash");