diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-19 23:03:17 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-20 17:29:37 +0100 |
| commit | 198cb7cf6376840927d897c24c5ab2bec36b4739 (patch) | |
| tree | 36e7b97779b207c4cc0e2bb7244d422d25ab7520 /crawl-ref/source/beam.cc | |
| parent | 2425ac2d2faab70cd993d56aa7610d9cd1ff7d8f (diff) | |
| download | crawl-ref-198cb7cf6376840927d897c24c5ab2bec36b4739.tar.gz crawl-ref-198cb7cf6376840927d897c24c5ab2bec36b4739.zip | |
Stop tracers from complaining about the previous orb.
Also, make them imprevious to disintegration -- should we explode instead?
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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); |