summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-10-12 22:53:57 +0200
committerAdam Borowski <kilobyte@angband.pl>2009-10-12 22:53:57 +0200
commit487e80ffa4d3e30e73ae20aae57711d125492758 (patch)
tree5be4a8729c1d3a8a4516bd2f5109d6b45f9786f5 /crawl-ref
parent2d8bce8bd8adcecf9875d9cf142d0cbee35a18d4 (diff)
downloadcrawl-ref-487e80ffa4d3e30e73ae20aae57711d125492758.tar.gz
crawl-ref-487e80ffa4d3e30e73ae20aae57711d125492758.zip
Let missiles go past bushes.
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/beam.cc7
-rw-r--r--crawl-ref/source/dat/descript/monsters.txt2
2 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 33f810a08b..9fcd2eb859 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4591,6 +4591,13 @@ void bolt::affect_monster(monsters* mon)
return;
}
+ // Missiles go past bushes.
+ if (!is_beam && mon->type == MONS_BUSH)
+ {
+ apply_hit_funcs(mon, 0);
+ return;
+ }
+
// Fire storm creates these, so we'll avoid affecting them
if (name == "great blast of fire" && mon->type == MONS_FIRE_VORTEX)
{
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 870c96c8f7..618a85040a 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -414,7 +414,7 @@ A viscous liquid, flowing along the floor in search of organic matter to corrode
%%%%
bush
-A woody plant that, unlike trees, can be removed even with bare hands. It looks dry enough to be easily set on fire.
+A woody plant that, unlike trees, can be removed even with bare hands. It looks dry enough to be easily set on fire, and it isn't very dense so arrows are likely to go past it.
%%%%
water moccasin