theft vs donning, round 2 (trunk only)

The message "you stop taking off <that armor>" when interrupted by a
nymph's or monkey's theft attack would only be given if you were using 'A'
to take off the armor.  If you used 'T', you'd get "you stop putting on
<that armor>" instead.  The fix for that also makes it easy to vary the
nymph message "<the nymph persuades> you to start taking off" to be "<the
nymph persuades you to continue taking off" when taking that same piece
of armor off was interrupted by the theft.
This commit is contained in:
nethack.rankin
2012-02-05 04:26:48 +00:00
parent ef888e065a
commit a2f15cfd61
4 changed files with 50 additions and 11 deletions

View File

@@ -2263,7 +2263,7 @@ register struct monst *mon;
else You_feel("very attracted to %s.", mon_nam(mon));
/* if in the process of putting armor on or taking armor off,
interrupt that activity now */
stop_donning((struct obj *)0);
(void) stop_donning((struct obj *)0);
/* don't try to take off gloves if cursed weapon blocks them */
if (welded(uwep)) tried_gloves = 1;