Rangers always succeed in disarming bear traps

NetHack · Jul 18, 2022 · e4cb3f0 · e4cb3f0
1 parent 88ec641
commit e4cb3f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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--;