From 2d1dc73ba81562198242670c328146d3f13695c6 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 3 Apr 2009 17:06:22 +0000 Subject: * Allow fleeing monster to push past higher ranked monsters of the same type. * Allow quivering of wielded missiles (stones for Sandblast etc.) and wielded weapons of returning if your throwing skill is > 0. * Add stairs/gates/shops to the 'V' command, mostly for the convenience of the easy travel feature. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9574 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 605c07b749..dae307097d 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4956,12 +4956,11 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) return (MON_OTHER); } - if (mon->add_ench(ENCH_CHARM)) + if (!mon->has_ench(ENCH_CHARM)) { - // FIXME: Put in an exception for fungi, plants and other - // things you won't notice becoming charmed. if (simple_monster_message(mon, " is charmed.")) obvious_effect = true; + mon->add_ench(ENCH_CHARM); } return (MON_AFFECTED); -- cgit v1.2.3-54-g00ecf