summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-03 16:33:59 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-03 16:33:59 +0000
commit7a807a464f67fd236f610b04ae7468554229e967 (patch)
tree162738e925bae98bb5aaf12eab832ebfcdd2cedf /crawl-ref/source/fight.cc
parent6b15ccc669c1e4625d6964026c4ee2f923f454de (diff)
downloadcrawl-ref-7a807a464f67fd236f610b04ae7468554229e967.tar.gz
crawl-ref-7a807a464f67fd236f610b04ae7468554229e967.zip
Fire resistant monsters drown in lava instead of being incinerated.
Used correct check to see if monsters can drown. Monsters quaffing healing are also cured of confusion and rotting now (Erik). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1201 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 1e99499072..dc5c27120a 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2767,10 +2767,11 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk)
special_damage = special_damage * 2 / 3;
if (needs_message && special_damage)
- mprf("%s %s %s!",
+ mprf("%s %s %s%s",
attacker->name(DESC_CAP_THE).c_str(),
attacker->conj_verb("shock").c_str(),
- defender->name(DESC_NOCAP_THE).c_str());
+ defender->name(DESC_NOCAP_THE).c_str(),
+ special_attack_punctuation().c_str());
#ifdef DEBUG_DIAGNOSTICS
mprf(MSGCH_DIAGNOSTICS, "Shock damage: %d", special_damage);