diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-19 18:34:09 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-19 18:34:09 +0000 |
commit | d91ad5d1d25e3d587192994fc42f229804804991 (patch) | |
tree | 0f1a6f3b67fd5ea471952622819b90270b665832 /crawl-ref/source/beam.cc | |
parent | 5904e93aa4220ebb102df0510f11f21980ed6ffa (diff) | |
download | crawl-ref-d91ad5d1d25e3d587192994fc42f229804804991.tar.gz crawl-ref-d91ad5d1d25e3d587192994fc42f229804804991.zip |
Make sure (very) ugly things never resist polymorph beams.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10733 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 57af9eb18f..fc042aa19f 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4885,9 +4885,20 @@ mon_resist_type bolt::try_enchant_monster(monsters *mon) if (mons_immune_magic(mon)) return (MON_UNAFFECTED); - if (flavour != BEAM_POLYMORPH || !mons_is_shapeshifter(mon)) + // (Very) ugly things and shapeshifters will never resist + // polymorph beams. + if (flavour == BEAM_POLYMORPH + && (mon->type == MONS_UGLY_THING + || mon->type == MONS_VERY_UGLY_THING + || mons_is_shapeshifter(mon))) + { + ; + } + else + { if (check_mons_resist_magic(mon, ench_power)) return (MON_RESIST); + } } return (apply_enchantment_to_monster(mon)); |