From: nhmall <nhmall@nethack.org>
Date: Thu, 2 Jun 2022 23:20:21 +0000 (-0400)
Subject: fix message when monster's two-handed weapon welds
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=516df172d0fae1265edf184fe15fff2b493e978a;p=nethack

fix message when monster's two-handed weapon welds

K3610 reported to devteam:
When you see a monster wield a cursed two-handed weapon,
the weapon "welds itself to the foo's hand" instead of its "hands."

Observed on hill orcs wielding a cursed two-handed sword.
---

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index e90b77e8f..bfdc6e955 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -915,6 +915,8 @@ if player gave a subset count when removing an item from a container, then got
 	the pickup_burden prompt and declined to continue, the item remained
 	split rather be recombined, making it possible to create multiple
 	stacks of gold inside a container
+two-handed weapon message stated "welded to monsters hand" instead of
+	"welded to monsters hands"
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/weapon.c b/src/weapon.c
index 4c158abe9..ab41e1fd0 100644
--- a/src/weapon.c
+++ b/src/weapon.c
@@ -836,9 +836,13 @@ mon_wield_item(struct monst *mon)
             newly_welded = mwelded(obj);
             obj->owornmask &= ~W_WEP;
             if (newly_welded) {
+                const char *mon_hand = mbodypart(mon, HAND);
+
+                if (bimanual(obj))
+                    mon_hand = makeplural(mon_hand);
                 pline("%s %s to %s %s!", Tobjnam(obj, "weld"),
                       is_plural(obj) ? "themselves" : "itself",
-                      s_suffix(mon_nam(mon)), mbodypart(mon, HAND));
+                      s_suffix(mon_nam(mon)), mon_hand);
                 obj->bknown = 1;
             }
         }