diff options
| author | Neil Moore <neil@s-z.org> | 2014-06-06 12:12:44 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-06-06 12:20:53 -0400 |
| commit | 27d8d3e4d69f909334ba85ea15586b2b1a721c87 (patch) | |
| tree | 9d955c9047af1b185132e2340793ed5f7688429d /crawl-ref/source/beam.cc | |
| parent | acf1c2352c425cd0a0069116e28d240042ce1cbb (diff) | |
| download | crawl-ref-27d8d3e4d69f909334ba85ea15586b2b1a721c87.tar.gz crawl-ref-27d8d3e4d69f909334ba85ea15586b2b1a721c87.zip | |
Allow inner flaming allies.
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index e1fffa3171..401e8a5d11 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -5254,6 +5254,10 @@ bool ench_flavour_affects_monster(beam_type flavour, const monster* mon, rc = mons_antimagic_affected(mon); break; + case BEAM_INNER_FLAME: + rc = !(mon->is_summoned() || mon->has_ench(ENCH_INNER_FLAME)); + break; + default: break; } @@ -6339,6 +6343,10 @@ bool bolt::nasty_to(const monster* mon) const // Positive effects. if (nice_to(mon)) return false; + + // Co-aligned inner flame is fine. + if (flavour == BEAM_INNER_FLAME && mons_aligned(mon, agent())) + return false; // Friendly and good neutral monsters don't mind being teleported. if (flavour == BEAM_TELEPORT) |