fiddlerwoaroof/crawl - Change WBNFHKUIC3JAIE5ZN6FZ5WIKBGET4U2JJGUDLDZNYQRLQLUYQYGQC

Consolidate the player and monster draining functions in fight.cc, make

monster draining take multiple levels of negative energy resistance into account, and only set the necromancy conduct if draining actually took place, as with draining beams.

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

Created by dolorous on January 18, 2009

WBNFHKUIC3JAIE5ZN6FZ5WIKBGET4U2JJGUDLDZNYQRLQLUYQYGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 7010 [6.962854]
B:BD[4.6498] → [5.3795:3830]
```
void player::drain_exp(actor *who)
```
[4.6498]
[5.3830]
```
bool player::drain_exp(actor *who)
```
Replacement in crawl-ref/source/player.cc at line 7012 [6.962854]
B:BD[5.3832] → [5.3832:3851]
```
    ::drain_exp();
```
[5.3832]
[5.3851]
```
    return (::drain_exp());
```
Replacement in crawl-ref/source/ouch.h at line 74 [6.1101726]
B:BD[6.1104294] → [7.188:231]
```
void drain_exp(bool announce_full = true);
```
[6.1104039]
[6.1104316]
```
bool drain_exp(bool announce_full = true);
```
Replacement in crawl-ref/source/ouch.cc at line 639 [6.1104358]
B:BD[6.1116931] → [7.233:268]
```
void drain_exp(bool announce_full)
```
[6.1116931]
[6.1116952]
```
bool drain_exp(bool announce_full)
```
Replacement in crawl-ref/source/ouch.cc at line 647 [6.1104358]
∅:D[7.336] → [6.1117307:1117323]
∅:D[2.2834] → [6.1117307:1117323]
B:BD[6.1117307] → [6.1117307:1117323]
```
        return;
```
[2.2834]
[6.1117323]
```
        return (false);
```
Insertion in crawl-ref/source/ouch.cc at line 654 [6.1104358]
[8.3964]
[9.2578]
Replacement in crawl-ref/source/ouch.cc at line 656 [6.1104358]
∅:D[9.2639] → [10.346:362]
B:BD[10.346] → [10.346:362]
```
        return;
```
[9.2639]
[10.362]
```
        return (true);
```
Replacement in crawl-ref/source/ouch.cc at line 662 [6.1104358]
B:BD[6.1117473] → [6.1117473:1117489]
```
        return;
```
[6.1117473]
[6.1117489]
```
        return (true);
```
Insertion in crawl-ref/source/ouch.cc at line 714 [6.1104358]
[6.1118383]
[6.1118383]
```
        return (true);
```
Insertion in crawl-ref/source/ouch.cc at line 717 [6.1104358]
[6.1118389]
[11.4256]
```
    return (false);
```
Replacement in crawl-ref/source/mon-util.cc at line 5898 [6.1699344]
B:BD[5.3913] → [5.3913:3952]
```
void monsters::drain_exp(actor *agent)
```
[5.3913]
[5.3952]
```
bool monsters::drain_exp(actor *agent)
```
Replacement in crawl-ref/source/mon-util.cc at line 5900 [6.1699344]
B:BD[5.3954] → [3.2642:2677]
∅:D[3.2677] → [5.3985:4001]
B:BD[5.3985] → [5.3985:4001]
```
    if (res_negative_energy() > 0)
        return;
```
[5.3954]
[5.4001]
```
    if (x_chance_in_y(res_negative_energy(), 3))
        return (false);
```
Insertion in crawl-ref/source/mon-util.cc at line 5915 [6.1699344]
[5.4167]
[12.1555]
```
    return (true);
```
Deletion in crawl-ref/source/fight.h at line 204 [6.3139131]
B:BD[4.54969] → [4.54969:55020]
```
    void drain_player();
    void drain_monster();
```

Deletion in crawl-ref/source/fight.cc at line 2052 [6.3140790]

B:BD[4.58510] → [4.58510:58593]

B:BD[4.58593] → [13.1784:1790]

∅:D[13.1790] → [4.58593:58617]

B:BD[4.58593] → [4.58593:58617]

B:BD[4.58617] → [13.1791:1828]

∅:D[13.1828] → [4.58617:58690]

B:BD[4.58617] → [4.58617:58690]

B:BD[4.58690] → [5.4422:4458]

∅:D[5.4458] → [14.4375:4487]

B:BD[4.58707] → [14.4375:4487]

B:BD[4.58894] → [4.58894:58932]

{
    // What to do, they're different...
    if (defender->atype() == ACT_PLAYER)
    {
        drain_player();
        obvious_effect = true;
    }
    else
        drain_monster();
}
void melee_attack::drain_player()
{
    defender->drain_exp(attacker);
    special_damage = random2(damage_done) /
                         (2 + defender->res_negative_energy()) + 1;
}
void melee_attack::drain_monster()

Replacement in crawl-ref/source/fight.cc at line 2053 [6.3140790]

B:BD[4.58934] → [3.2881:2946]

    if (defender->res_negative_energy() > 0 || one_chance_in(3))

[4.58934]

[4.58999]

    if (defender->atype() == ACT_MONSTER && one_chance_in(3))

Replacement in crawl-ref/source/fight.cc at line 2056 [6.3140790]

B:BD[15.3053] → [5.4459:4494]

    defender->drain_exp(attacker);

[15.3053]

[16.4934]

    const int rn = defender->res_negative_energy();
    if (defender->drain_exp(attacker))
    {
        if (defender->atype() == ACT_PLAYER)
            obvious_effect = true;

Replacement in crawl-ref/source/fight.cc at line 2063 [6.3140790]
∅:D[16.4939] → [4.59574:59627]
B:BD[4.59574] → [4.59574:59627]
```
    special_damage = 1 + (random2(damage_done) / 2);
```
[16.4935]
[5.4495]
```
        attacker->god_conduct(DID_NECROMANCY, 2);
    }
```
Replacement in crawl-ref/source/fight.cc at line 2066 [6.3140790]
∅:D[5.4496] → [4.59627:59673]
B:BD[4.59627] → [4.59627:59673]
```
    attacker->god_conduct(DID_NECROMANCY, 2);
```
[5.4496]
[17.2255]
```
    special_damage = 1 + random2(damage_done) / (2 + rn);
```
Replacement in crawl-ref/source/externs.h at line 338 [6.3270163]
B:BD[18.2934] → [5.4498:4544]
```
    virtual void drain_exp(actor *agent) = 0;
```
[18.2934]
[19.3340]
```
    virtual bool drain_exp(actor *agent) = 0;
```
Replacement in crawl-ref/source/externs.h at line 1078 [6.3270163]
B:BD[4.87136] → [5.4545:4574]
```
    void drain_exp(actor *);
```
[4.87136]
[19.3412]
```
    bool drain_exp(actor *);
```
Replacement in crawl-ref/source/externs.h at line 1510 [6.3270163]
B:BD[20.6983] → [5.4575:4604]
```
    void drain_exp(actor *);
```
[20.6983]
[19.3467]
```
    bool drain_exp(actor *);
```

Consolidate the player and monster draining functions in fight.cc, make

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 7010 [6.962854]

Replacement in crawl-ref/source/player.cc at line 7012 [6.962854]

Replacement in crawl-ref/source/ouch.h at line 74 [6.1101726]

Replacement in crawl-ref/source/ouch.cc at line 639 [6.1104358]

Replacement in crawl-ref/source/ouch.cc at line 647 [6.1104358]

Insertion in crawl-ref/source/ouch.cc at line 654 [6.1104358]

Replacement in crawl-ref/source/ouch.cc at line 656 [6.1104358]

Replacement in crawl-ref/source/ouch.cc at line 662 [6.1104358]

Insertion in crawl-ref/source/ouch.cc at line 714 [6.1104358]

Insertion in crawl-ref/source/ouch.cc at line 717 [6.1104358]

Replacement in crawl-ref/source/mon-util.cc at line 5898 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5900 [6.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5915 [6.1699344]

Deletion in crawl-ref/source/fight.h at line 204 [6.3139131]

Deletion in crawl-ref/source/fight.cc at line 2052 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 2053 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 2056 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 2063 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 2066 [6.3140790]

Replacement in crawl-ref/source/externs.h at line 338 [6.3270163]

Replacement in crawl-ref/source/externs.h at line 1078 [6.3270163]

Replacement in crawl-ref/source/externs.h at line 1510 [6.3270163]