]> granicus.if.org Git - nethack/commitdiff
Non-metallic gloves protect worn rings from shock
authorGuillaume Clemens <prdrdecroly@gmail.com>
Fri, 30 Jul 2021 14:37:17 +0000 (16:37 +0200)
committerPasi Kallinen <paxed@alt.org>
Mon, 6 Sep 2021 18:01:53 +0000 (21:01 +0300)
src/zap.c

index f27f82d2384cfb990912ce4e4d095f3246945f45..ae4c111addd928995ec90d937f88ca235e10c1ea 100644 (file)
--- a/src/zap.c
+++ b/src/zap.c
@@ -5070,7 +5070,8 @@ destroy_one_item(struct obj *obj, int osym, int dmgtyp)
         quan = obj->quan;
         switch (osym) {
         case RING_CLASS:
-            if (obj->otyp == RIN_SHOCK_RESISTANCE) {
+            if (((obj->owornmask & W_RING) && uarmg && !is_metallic(uarmg))
+                || obj->otyp == RIN_SHOCK_RESISTANCE) {
                 skip++;
                 break;
             }