Change to the resilience property: Instead of withering resistance - …

…we're going to go with disintegration resistance for the player. This matches more suitably with the item protection from destruction and erosion, and it's a much more valuable ability than withering deterrence.
elunna · Oct 3, 2023 · e234807 · e234807
1 parent 08e6a2b
commit e234807
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/include/obj.h b/include/obj.h
@@ -614,7 +614,7 @@ struct obj {
 #define ITEM_WWALK     0x02000000L /* extrinsic water walking */
 #define ITEM_SWIM      0x04000000L /* extrinsic swimming */
 #define ITEM_RAGE      0x08000000L /* extrinsic rage and fearlessness */
-#define ITEM_TOUGH     0x10000000L /* extrinsic withering res */
+#define ITEM_TOUGH     0x10000000L /* extrinsic disintegration res */
 #define ITEM_PROWESS   0x20000000L /* Speeds up tech cooldowns, skill bonuses */
 
 #define ITEM_MAGICAL   0x80000000L /* known to have magical properties */

diff --git a/src/do_wear.c b/src/do_wear.c
@@ -242,7 +242,7 @@ long mask;
         }
     }
     if (props & ITEM_TOUGH)
-        BWithering |= mask;
+        EDisint_resistance |= mask;
     if (props & ITEM_OILSKIN) {
         pline("%s very tightly.", Tobjnam(otmp, "fit"));
         otmp->oprops_known |= ITEM_OILSKIN;
@@ -349,7 +349,7 @@ long mask;
     if (props & ITEM_RAGE)
         EFearless &= ~mask;
     if (props & ITEM_TOUGH)
-        BWithering &= ~mask;
+        EDisint_resistance &= ~mask;
     if (props & ITEM_OILSKIN)
         otmp->oprops_known |= ITEM_OILSKIN;
     if (props & ITEM_ESP) {

diff --git a/src/mhitu.c b/src/mhitu.c
@@ -2645,11 +2645,6 @@ register struct attack *mattk;
         } else if (BWithering) {
             struct obj *o;
             You_feel("dessicated for a moment.");
-
-            if ((o = using_oprop(ITEM_TOUGH)) && !o->oprops_known) {
-                Your("%s absorbs the deathly withering!", xname(o));
-                o->oprops_known |= ITEM_VIGIL;
-            }
         }
 
         break;

diff --git a/src/pager.c b/src/pager.c
@@ -1292,7 +1292,7 @@ char *usr_text;
         if (obj->oprops & ITEM_STUN) OBJPUTSTR("Grants stun resistance");
         if (obj->oprops & ITEM_RAGE) OBJPUTSTR("Grants rage and fearlessness");
         if (obj->oprops & ITEM_PROWESS) OBJPUTSTR("Grants prowess in technical skills");
-        if (obj->oprops & ITEM_TOUGH) OBJPUTSTR("Grants withering resistance");
+        if (obj->oprops & ITEM_TOUGH) OBJPUTSTR("Grants disintegration resistance");
         if (obj->oprops & ITEM_OILSKIN) OBJPUTSTR("Permanently greased");
         if (obj->oprops & ITEM_FUMBLING) OBJPUTSTR("Grants fumbling");
     }

diff --git a/src/trap.c b/src/trap.c
@@ -163,7 +163,7 @@ int ef_flags;
     if (!otmp)
         return ER_NOTHING;
 
-    /* Tough items are immune to erosion. */
+    /* Resiliant items are immune to erosion. */
     if (otmp && otmp->oprops & ITEM_TOUGH) {
         otmp->oprops_known |= ITEM_TOUGH;
         return FALSE;

diff --git a/src/wield.c b/src/wield.c
@@ -205,7 +205,7 @@ register struct obj *obj;
             EFearless &= ~W_WEP;
         }
         if (olduwep->oprops & ITEM_TOUGH) {
-            BWithering &= ~W_WEP;
+            EDisint_resistance &= ~W_WEP;
         }
     }
 
@@ -300,7 +300,7 @@ register struct obj *obj;
             }
         }
         if (uwep->oprops & ITEM_TOUGH) {
-            BWithering |= W_WEP;
+            EDisint_resistance |= W_WEP;
         }
     }
 
@@ -601,7 +601,7 @@ register struct obj *obj;
         }
         /* Toughness */
         if (olduswapwep->oprops & ITEM_TOUGH) {
-            BWithering &= ~W_SWAPWEP;
+            EDisint_resistance &= ~W_SWAPWEP;
         }
     }
 
@@ -696,7 +696,7 @@ register struct obj *obj;
             }
         }
         if (uswapwep->oprops & ITEM_TOUGH) {
-            BWithering |= W_SWAPWEP;
+            EDisint_resistance |= W_SWAPWEP;
         }
     }