diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 07:35:21 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 07:35:21 +0000 |
| commit | 3f1477cd578fd1e5e1931351c8ea1b9ad18d4a5c (patch) | |
| tree | 1f96f1cc676d4387d344ebce36a4f455e73d2f72 /crawl-ref/source/spells3.cc | |
| parent | 7b6e06e7dfb876a56c99e2216a6071e0a652caf9 (diff) | |
| download | crawl-ref-3f1477cd578fd1e5e1931351c8ea1b9ad18d4a5c.tar.gz crawl-ref-3f1477cd578fd1e5e1931351c8ea1b9ad18d4a5c.zip | |
Apply r6620, r6624, r6625, r6628 and r6632 to 0.4.
Save existing ghosts back to bones files even for undead players.
Fix HP bar blanking out when wrapping.
Fix TSO regarding attacks on evil creatures as unchivalric.
Fix Twisted Resurrection abominations not counting as undead.
Fix monsters being generated with stacks of returning weapons.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6666 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
| -rw-r--r-- | crawl-ref/source/spells3.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index aabfc95a42..e2f1150de6 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1106,8 +1106,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); @@ -1134,9 +1132,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) |