summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-10-12 22:01:42 +0200
committerAdam Borowski <kilobyte@angband.pl>2009-10-12 22:01:42 +0200
commit759d9c1e18f28af3d2e8f1bfc234ec25dcfc2081 (patch)
treeb2515e11db09c9e95e3c637f004c4a7e0208c7fa /crawl-ref/source/beam.cc
parent2495f7b7d5bc09feaea3d8a0bf148e2fcf7ff5a7 (diff)
downloadcrawl-ref-759d9c1e18f28af3d2e8f1bfc234ec25dcfc2081.tar.gz
crawl-ref-759d9c1e18f28af3d2e8f1bfc234ec25dcfc2081.zip
Bushes -- tree-like monsters than can be destroyed with any means of damage,
and are much easier to set on fire than trees.
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc23
1 files changed, 7 insertions, 16 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index d323bb995a..33f810a08b 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2229,25 +2229,16 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted,
if (doFlavouredEffects)
simple_monster_message(monster, " resists.");
}
- else if (original < hurted)
+ else if (original < hurted && doFlavouredEffects)
{
if (mons_is_icy(monster->type))
- {
- if (doFlavouredEffects)
- simple_monster_message(monster, " melts!");
- }
+ simple_monster_message(monster, " melts!");
+ else if (monster->type == MONS_BUSH)
+ simple_monster_message(monster, " is on fire!");
+ else if (pbolt.flavour == BEAM_FIRE)
+ simple_monster_message(monster, " is burned terribly!");
else
- {
- if (doFlavouredEffects)
- {
- if (pbolt.flavour == BEAM_FIRE)
- simple_monster_message(monster,
- " is burned terribly!");
- else
- simple_monster_message(monster,
- " is scalded terribly!");
- }
- }
+ simple_monster_message(monster, " is scalded terribly!");
}
break;