fiddlerwoaroof/crawl - Change 33JLM6JOCBQFNCVIXQ35LHRHGQZVICLBJEYQUGCKKRAATTZAUWNQC

Remove the experience check for killing monsters with enslaved souls,

since if you take their souls, you won't get any experience anyway.

This is also consistent with the behavior if you enslave a monster's soul, and then confuse it; if it e.g. steps in deep water and drowns, you'll get a normal kill with experience. Seeing as it's difficult to manually move a newly created abomination or spectral thing to the nearest habitable ground if it's not there initially, and the potential oddities if there is no habitable ground nearby, I'm choosing to interpret the behavior as a feature. As for an in-game explanation, you can only bind enslaved souls to you when you're near them, and if they're e.g. at the bottom of deep water, they're not near you.

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

Created by dolorous on January 7, 2009

33JLM6JOCBQFNCVIXQ35LHRHGQZVICLBJEYQUGCKKRAATTZAUWNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1031 [4.1396662]

B:BD[3.22401] → [2.11345:11386]

∅:D[2.11386] → [5.7335:7408]

B:BD[5.7335] → [5.7335:7408]

    const bool gives_xp      = !summoned
                               && !mons_enslaved_body_and_soul(monster);

[3.22401]

[6.2499]

    const bool gives_xp      = !summoned;

Replacement in crawl-ref/source/monstuff.cc at line 7515 [4.1396662]

B:BD[7.3408] → [7.3408:3556]

                    simple_monster_message( mons, " is incinerated.",
                                            MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

[7.3408]

[7.3556]

                    simple_monster_message(mons, " is incinerated.",
                                           MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

Replacement in crawl-ref/source/monstuff.cc at line 7520 [4.1396662]

B:BD[7.3593] → [7.3593:3660]

B:BD[8.3408] → [8.3408:3486]

                    simple_monster_message( mons, " falls apart.",
                                            MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

[7.3593]

[8.3486]

                    simple_monster_message(mons, " falls apart.",
                                           MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

Replacement in crawl-ref/source/monstuff.cc at line 7525 [4.1396662]

B:BD[7.3775] → [7.3775:3915]

                    simple_monster_message( mons, " drowns.",
                                            MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

[7.3775]

[7.3915]

                    simple_monster_message(mons, " drowns.",
                                           MSGCH_MONSTER_DAMAGE, MDAM_DEAD);