From e4cb3f083251cce903a6a6a80c607aba9f67db4f Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 18 Jul 2022 17:22:19 +0300
Subject: [PATCH] Rangers always succeed in disarming bear traps

---
 doc/fixes3-7-0.txt | 1 +
 src/trap.c         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index cbdcfd0d43..c61c471a29 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -969,6 +969,7 @@ make taming via magic harp be consistent with scroll of taming and charm
 	spell:  an angry shopkeeper becomes pacified (but never tamed)
 wielding a bec de corbin makes ravens generate peaceful
 moving with 'm' prefix allows hero to enter a known pit carefully
+rangers always succeed in disarming bear traps, unless impaired
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/trap.c b/src/trap.c
index 9c7c12b4ef..524d9d4714 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -4554,6 +4554,8 @@ untrap_prob(
     /* Your own traps are better known than others. */
     if (ttmp->madeby_u)
         chance--;
+    if (Role_if(PM_RANGER) && ttmp->ttyp == BEAR_TRAP && chance <= 3)
+        return 0; /* always succeeds */
     if (Role_if(PM_ROGUE)) {
         if (rn2(2 * MAXULEV) < u.ulevel)
             chance--;