From: nethack.allison <nethack.allison>
Date: Mon, 6 Mar 2006 04:11:36 +0000 (+0000)
Subject: magicbane grammar
X-Git-Tag: MOVE2GIT~1096
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e8725ed952ce02f58c967bf27a9b93787b7c133;p=nethack

magicbane grammar

I don't know for sure what all the possible values of hittee passed to
Mb_hit() are, but this checks to see if it matches the name of the
mdef monster and forces the word "is" if it does.
---

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index ae47cf198..1020b45a3 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -198,6 +198,7 @@ more precise probing/stethoscope feedback when engulfed
 make baby long worms have lower level than full grown ones
 use "your kraken" instead of "a kraken" when searching reveals a tame
 	hidden monster
+Magicbane should not produce "<something> are confused" message
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/artifact.c b/src/artifact.c
index 1dad6d9e6..3d79d17eb 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -787,6 +787,7 @@ char *hittee;			/* target's name: "you" or mon_nam(mdef) */
     boolean youattack = (magr == &youmonst),
 	    youdefend = (mdef == &youmonst),
 	    resisted = FALSE, do_stun, do_confuse, result;
+    boolean hitteename = (has_name(mdef) && !strcmpi(hittee, MNAME(mdef)));
     int attack_indx, scare_dieroll = MB_MAX_DIEROLL / 2;
 
     result = FALSE;		/* no message given yet */
@@ -936,7 +937,8 @@ char *hittee;			/* target's name: "you" or mon_nam(mdef) */
 	    if (do_stun) Strcat(buf, "stunned");
 	    if (do_stun && do_confuse) Strcat(buf, " and ");
 	    if (do_confuse) Strcat(buf, "confused");
-	    pline("%s %s %s%c", hittee, vtense(hittee, "are"),
+	    pline("%s %s %s%c", hittee,
+		  hitteename ? "is" : vtense(hittee, "are"),
 		  buf, (do_stun && do_confuse) ? '!' : '.');
 	}
     }