From 0da45c1e7420e886ba8bf8ddd107262f11af0961 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Sat, 5 Jul 2025 19:59:23 +0300
Subject: [PATCH] Fix Snickersnee attack

Adding the extra attack to Snickersnee made the weapon always
attack from range, even when it was used in melee.
---
 src/uhitm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/uhitm.c b/src/uhitm.c
index d43fe53be..65b311e4c 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1055,7 +1055,8 @@ hmon_hitmon_weapon(
         /* or strike with a missile in your hand... */
         || (!hmd->thrown && (is_missile(obj) || is_ammo(obj)))
         /* or use a pole at short range and not mounted... */
-        || (!hmd->thrown && !u.usteed && is_pole(obj))
+        || (!hmd->thrown && !u.usteed && is_pole(obj)
+            && !is_art(obj,ART_SNICKERSNEE))
         /* or throw a missile without the proper bow... */
         || (is_ammo(obj) && (hmd->thrown != HMON_THROWN
                              || !ammo_and_launcher(obj, uwep)))) {