diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-21 20:29:46 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-21 20:29:46 +0000 |
| commit | 2ba0c7b650e80810a78c8a3b2c943c8f730e571b (patch) | |
| tree | a5b56855453777be339430a1047f4398bde746cd /crawl-ref | |
| parent | 17652535bdeaf8d56ee88ed9296708ff6efd8a31 (diff) | |
| download | crawl-ref-2ba0c7b650e80810a78c8a3b2c943c8f730e571b.tar.gz crawl-ref-2ba0c7b650e80810a78c8a3b2c943c8f730e571b.zip | |
Fix 2022531: Twisted Resurrection abominations are undead again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6628 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 5 |
2 files changed, 3 insertions, 14 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 22f0255482..7e667d257f 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -372,15 +372,9 @@ static int _scan_mon_inv_randarts( const monsters *mon, // Twisted Resurrection. static bool _mons_your_abomination(const monsters *mon) { - if (mon->type != MONS_ABOMINATION_SMALL - && mon->type != MONS_ABOMINATION_LARGE) - { - return (false); - } - - // XXX: Reusing the colour scheme - hacky! (jpeg) - return (mon->number == BROWN || mon->number == RED - || mon->number == LIGHTRED); + return ((mon->type == MONS_ABOMINATION_SMALL + || mon->type == MONS_ABOMINATION_LARGE) + && testbits(mon->flags, MF_CREATED_FRIENDLY)); } mon_holy_type mons_holiness(const monsters *mon) diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 9796b12cfa..2a2aee8b14 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1095,8 +1095,6 @@ bool cast_twisted_resurrection(int pow, god_type god) if (total_mass < 400 + roll_dice(2, 500) || how_many_corpses < (coinflip() ? 3 : 2)) { - mpr("The spell fails."); - mprf("The corpse%s collapse%s into a pulpy mess.", how_many_corpses > 1 ? "s": "", how_many_corpses > 1 ? "": "s"); return (false); @@ -1123,9 +1121,6 @@ bool cast_twisted_resurrection(int pow, god_type god) return (false); } - // This was probably intended, but it's really boring. (jpeg) - // Use menv[mon].number instead (set in create_monster()). -// menv[mon].colour = colour; mpr("The heap of corpses melds into an agglomeration of writhing flesh!"); if (mon == MONS_ABOMINATION_LARGE) |