From: PatR <rankin@nethack.org>
Date: Thu, 3 Feb 2022 12:42:19 +0000 (-0800)
Subject: rubber hose attacks
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fffa9d58b70d9b207ec2c231785293417059132e;p=nethack

rubber hose attacks

Give similar feedback for attacking with a rubber hose as for bullwhip:
the wielder "lashes" rather than "swings".
---

diff --git a/src/mhitu.c b/src/mhitu.c
index e738cf138..fa73bb196 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -98,7 +98,8 @@ mswings_verb(
 {
     const char *verb;
     int otyp = mwep->otyp,
-        lash = (otyp == BULLWHIP),
+        /* (monsters don't actually wield towels, wet or otherwise) */
+        lash = (objects[otyp].oc_skill == P_WHIP || is_wet_towel(mwep)),
         /* some weapons can have more than one strike type; for those,
            give a mix of thrust and swing (caller doesn't care either way) */
         thrust = ((objects[otyp].oc_dir & PIERCE) != 0
diff --git a/src/uhitm.c b/src/uhitm.c
index bf03a6dfc..6b13551e9 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1374,7 +1374,7 @@ hmon_hitmon(
             You("%s %s%s",
                 (obj && (is_shield(obj)
                          || obj->otyp == HEAVY_IRON_BALL)) ? "bash"
-                : (obj && (obj->otyp == BULLWHIP
+                : (obj && (objects[obj->otyp].oc_skill == P_WHIP
                            || is_wet_towel(obj))) ? "lash"
                   : Role_if(PM_BARBARIAN) ? "smite"
                     : "hit",