From 32f3f7cf46cb4d40d29258ede4092af93f2053bf Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Wed, 10 Jan 2024 12:24:05 -0800
Subject: [PATCH] Forcefighting webs (when adjacent, not trapped)

ACURR(A_STR) can yield a value as high as 125.  Switch to acurrstr()-2
for a value of 1..19.

P_SKILL(skilltype) shouldn't be used unconditionally.  It yields a
different value for restricted than for unskilled and those two skill
levels only differ for training, not effectiveness.

Allow weaponless forcefight againsta webs.  The chance for success may
need to be tweaked.
---
 src/hack.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/hack.c b/src/hack.c
index 352a4adf8..34cfa3047 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -1831,23 +1831,32 @@ domove_fight_web(coordxy x, coordxy y)
 {
     struct trap *trap = t_at(x, y);
 
-    if (gc.context.forcefight && trap && trap->ttyp == WEB
-        && trap->tseen && uwep) {
-        int wtype = uwep_skill_type();
+    if (gc.context.forcefight && trap && trap->ttyp == WEB && trap->tseen) {
+        int wtype = uwep_skill_type(),
+            /* minus_2: restricted or unskilled: -1, basic: 0, skilled: 1,
+               expert: 2, master: 3, grandmaster: 4 */
+            wskill_minus_2 = max(P_SKILL(wtype), P_UNSKILLED) - 2,
+            /* higher value is worse for player; for weaponless, adjust the
+               chance to succeed rather than maybe make two tries */
+            roll = rn2(uwep ? 20 : (45 - 5 * wskill_minus_2));
 
-        if (u_wield_art(ART_STING)) {
+        if (uwep && u_wield_art(ART_STING)) {
             /* guaranteed success */
             pline("%s cuts through the web!",
                   bare_artifactname(uwep));
-        } else if (!is_blade(uwep)) {
+        } else if (uwep && !is_blade(uwep)) {
             You_cant("cut a web with %s!", an(xname(uwep)));
             return TRUE;
-        } else if (rn2(20) > ACURR(A_STR) + uwep->spe + P_SKILL(wtype)) {
+        } else if (roll > (acurrstr() - 2 /* 1..19 */
+                           /* for weaponless, 'roll' was adjusted above */
+                           + (uwep ? uwep->spe + wskill_minus_2 : 0))) {
             /* TODO: add failures, maybe make an occupation? */
-            You("hack ineffectually at some of the strands.");
+            You("%s ineffectually at some of the strands.",
+                uwep ? "hack" : "thrash");
             return TRUE;
         } else {
-            You("cut through the web.");
+            You("%s through the web.", uwep ? "cut" : "punch");
+            /* doesn't break "never hit with a wielded weapon" conduct */
             use_skill(wtype, 1);
         }
         deltrap(trap);