fiddlerwoaroof/crawl - Change UJXSA7XD3VRGAUKFZ2BJAISAXOXTU6HNBEWT4FGBVQLQD5R2QB4QC

Fix [2484631]: Move all monster-based experience-draining effects other

than the setting of special_damage from mons_apply_attack_flavour() to mons_perform_attack_rounds(), after the check for chaos effects' banishing the defender.

Without this, the latter check, which only determines if a monster is alive, can succeed on mortally draining a monster as well as banishing it, and the drained monster's death event will never be triggered.
Among other things, the check is based on the assumption that all attack flavors only set special_damage instead of directly damaging and possibly killing the monster. With this, the assumption is now true.

The change in r8336 to allow cleanup of the dead in monsters::hurt() even for already dead monsters is necessary for this, as well, since draining can still kill the monster via monsters::hurt() before special_damage does.

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

Created by dolorous on January 8, 2009

UJXSA7XD3VRGAUKFZ2BJAISAXOXTU6HNBEWT4FGBVQLQD5R2QB4QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/fight.cc at line 2061 [6.3140790]
∅:D[4.4935] → [5.59254:59280]
B:BD[5.59254] → [5.59254:59280]
B:BD[5.59280] → [7.295:301]
∅:D[7.301] → [5.59280:59305]
B:BD[5.59280] → [5.59280:59305]
B:BD[5.59305] → [7.302:338]
∅:D[7.338] → [5.59314:59357]
B:BD[5.59314] → [5.59314:59357]
B:BD[5.59357] → [3.3052:3110]
∅:D[3.3110] → [4.4938:4939]
B:BD[5.59565] → [4.4938:4939]
```
    if (one_chance_in(5))
    {
        def->hit_dice--;
        def->experience = 0;
    }
    def->max_hit_points -= 2 + random2(3);
    def->hurt(attacker, 2 + random2(3), BEAM_NEG, false);
```

Insertion in crawl-ref/source/fight.cc at line 4546 [6.3140790]

[5.78220]

[6.3247695]


        const bool draining_attack = damage_brand == SPWPN_DRAINING
                                         || (attk.flavour == AF_DRAIN_XP
                                             && attacker != defender);

Insertion in crawl-ref/source/fight.cc at line 4659 [6.3140790]

[2.21726]

[5.80314]

            if (draining_attack && defender->atype() == ACT_MONSTER)
            {
                if (one_chance_in(5))
                {
                    def->hit_dice--;
                    def->experience = 0;
                }
                def->max_hit_points -= 2 + random2(3);
                def->hurt(attacker, 2 + random2(3), BEAM_NEG, false);
            }