fix more of #2629 - striking/force bolt feedback (trunk only)

     From a bug report, the message "Boing!" is given if wand of striking
or spell of force bolt is aimed at magic resistant hero by self or by
monster, or at magic resistant monster by another monster, but it was
omitted when aimed at magic resistant monster by the hero.  The shield
effect animation for resistance is given in all the cases.

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 235fd824087bf726459a43f6d456a43b6e3a1b0b..df998dc6de0d06f8ca17e4501076a5bfbb46d6b5 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -414,6 +414,7 @@ alchemical explosion or evaporation only used up one potion instead of all
 feedback for reverse-genocide was plural even when just one monster was created
 fix message given when part of a stack of items in a monster's inventory is
        being destroyed
+add "Boing!" message when hero zaps resistant monster with striking/force bolt
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/zap.c b/src/zap.c
index 644da6619dad9dbf34e3867801efdaa23b824162..7743308b5f7b3d7f2a90b9a63a9a89b5faae0bf4 100644 (file)
--- a/src/zap.c
+++ b/src/zap.c
@@ -171,6 +171,7 @@ struct obj *otmp;
                reveal_invis = TRUE;
                if (resists_magm(mtmp)) {       /* match effect on player */
                        shieldeff(mtmp->mx, mtmp->my);
+                       pline("Boing!");
                        break;  /* skip makeknown */
                } else if (u.uswallow || rnd(20) < 10 + find_mac(mtmp)) {
                        dmg = d(2,12);