From 198cb7cf6376840927d897c24c5ab2bec36b4739 Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Sat, 19 Dec 2009 23:03:17 +0100 Subject: Stop tracers from complaining about the previous orb. Also, make them imprevious to disintegration -- should we explode instead? --- crawl-ref/source/beam.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index c887250051..a37fe4b70d 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -6028,6 +6028,12 @@ bool bolt::nasty_to(const monsters *mon) const if (flavour == BEAM_HOLY) return (mon->res_holy_energy(agent()) <= 0); + // The orbs are made of pure disintegration energy. This also has the side + // effect of not stopping us from firing further orbs when the previous one + // is still flying. + if (flavour == BEAM_DISINTEGRATION || flavour == BEAM_NUKE) + return (mon->type != MONS_ORB_OF_DESTRUCTION); + // Take care of other non-enchantments. if (!is_enchantment()) return (true); -- cgit v1.2.3-54-g00ecf