fiddlerwoaroof/crawl - Change 7Z4ZIXRD3RNS3GXJAKWTMG5PRKYMK3GLP6S7GA32ENYH6DWTGF3AC

Make draining beams use actor::drain_exp() too, and make the necromancy

conduct for draining consistent between beams and melee attacks.

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

Created by dolorous on January 17, 2009

7Z4ZIXRD3RNS3GXJAKWTMG5PRKYMK3GLP6S7GA32ENYH6DWTGF3AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/fight.cc at line 2069 [6.3140790]
∅:D[4.4487] → [5.58802:58894]
B:BD[5.58802] → [5.58802:58894]
```
    // Noop for monsters, but what the heck.
    attacker->god_conduct(DID_NECROMANCY, 2);
```

Replacement in crawl-ref/source/beam.cc at line 2217 [6.4128068]

B:BD[6.4183317] → [6.4183317:4183378]

            simple_monster_message(monster, " is drained.");

[6.4183317]

[7.1236]

            monster->drain_exp(pbolt.agent());

Replacement in crawl-ref/source/beam.cc at line 2221 [6.4128068]

B:BD[8.6420] → [4.33957:33971]

∅:D[4.33971] → [9.32210:32327]

B:BD[8.6420] → [9.32210:32327]

B:BD[9.32327] → [4.33972:33986]

∅:D[7.1480] → [10.293:294]

∅:D[11.2272] → [10.293:294]

∅:D[8.6505] → [10.293:294]

∅:D[9.32327] → [10.293:294]

∅:D[4.33986] → [10.293:294]

B:BD[10.293] → [10.293:294]

∅:D[10.294] → [6.4183379:4183413]

B:BD[6.4183379] → [6.4183379:4183413]

B:BD[6.4183413] → [2.417:431]

∅:D[2.431] → [6.4183413:4183450]

B:BD[6.4183413] → [6.4183413:4183450]

B:BD[6.4183450] → [2.432:487]

∅:D[2.487] → [6.4183450:4183506]

B:BD[6.4183450] → [6.4183450:4183506]

B:BD[6.4183506] → [12.7853:7908]

∅:D[12.7908] → [6.4183557:4183766]

B:BD[6.4183557] → [6.4183557:4183766]

            {
                did_god_conduct(DID_NECROMANCY, 2 + random2(3),
                                pbolt.effect_known);
            }
            if (one_chance_in(5))
            {
                monster->hit_dice--;
                monster->experience = 0;
            }
            monster->max_hit_points -= 2 + random2(3);
            monster->hit_points     -= 2 + random2(3);
            if (monster->hit_points >= monster->max_hit_points)
                monster->hit_points = monster->max_hit_points;
            if (monster->hit_dice < 1)
                monster->hit_points = 0;

[8.6420]

[6.4183766]

                did_god_conduct(DID_NECROMANCY, 2, pbolt.effect_known);

Replacement in crawl-ref/source/beam.cc at line 4035 [6.4128068]

B:BD[3.47060] → [3.47060:47123]

    // Don't do side effects (beam might miss or be a tracer.)

[3.47060]

[3.47123]

    // Don't do side effects (beam might miss or be a tracer).